From 502425ad80ab19d42d1af2fb90e5e141d2f2a186 Mon Sep 17 00:00:00 2001 From: Aetias Date: Thu, 23 May 2024 18:38:55 +0200 Subject: [PATCH] Rename `Atan2` --- asm/itcm.s | 8 +- asm/main/main_02000000.inc | 2 +- asm/main/main_02000000.s | 6 +- asm/ov00/Actor/Actor.inc | 2 +- asm/ov00/Actor/Actor.s | 4 +- asm/ov00/Player/LinkStateBase.inc | 2 +- asm/ov00/Player/LinkStateBase.s | 4 +- asm/ov00/Player/LinkStateDamage.inc | 2 +- asm/ov00/Player/LinkStateDamage.s | 6 +- asm/ov00/Player/LinkStateInteract.inc | 2 +- asm/ov00/Player/LinkStateInteract.s | 10 +- asm/ov00/Player/PlayerBase.inc | 2 +- asm/ov00/Player/PlayerBase.s | 2 +- asm/ov00/Player/PlayerControl.inc | 2 +- asm/ov00/Player/PlayerControl.s | 4 +- asm/ov00/ov00_02086cd0.inc | 2 +- asm/ov00/ov00_02086cd0.s | 18 +-- asm/ov00/ov00_020980f4.inc | 2 +- asm/ov00/ov00_020980f4.s | 12 +- asm/ov00/ov00_020b1498.inc | 2 +- asm/ov00/ov00_020b1498.s | 48 +++--- asm/ov00/ov00_020c3e54.inc | 2 +- asm/ov00/ov00_020c3e54.s | 36 ++--- asm/ov03.inc | 2 +- asm/ov03.s | 16 +- asm/ov04.inc | 2 +- asm/ov04.s | 2 +- asm/ov05.inc | 2 +- asm/ov05.s | 16 +- asm/ov12.inc | 2 +- asm/ov12.s | 4 +- asm/ov14/ov14_0211f640.inc | 2 +- asm/ov14/ov14_0211f640.s | 24 +-- asm/ov14/ov14_0213b778.inc | 2 +- asm/ov14/ov14_0213b778.s | 20 +-- asm/ov15.inc | 2 +- asm/ov15.s | 212 +++++++++++++------------- asm/ov17.inc | 2 +- asm/ov17.s | 2 +- asm/ov18.inc | 2 +- asm/ov18.s | 6 +- asm/ov19.inc | 2 +- asm/ov19.s | 8 +- asm/ov20.inc | 2 +- asm/ov20.s | 6 +- asm/ov21.inc | 2 +- asm/ov21.s | 2 +- asm/ov22.inc | 2 +- asm/ov22.s | 6 +- asm/ov23.inc | 2 +- asm/ov23.s | 20 +-- asm/ov24.inc | 2 +- asm/ov24.s | 44 +++--- asm/ov25.inc | 2 +- asm/ov25.s | 10 +- asm/ov27.inc | 2 +- asm/ov27.s | 22 +-- asm/ov28.inc | 2 +- asm/ov28.s | 10 +- asm/ov29.inc | 2 +- asm/ov29.s | 4 +- asm/ov30.inc | 2 +- asm/ov30.s | 20 +-- asm/ov32.inc | 2 +- asm/ov32.s | 2 +- asm/ov33.inc | 2 +- asm/ov33.s | 2 +- asm/ov34.inc | 2 +- asm/ov34.s | 24 +-- asm/ov35.inc | 2 +- asm/ov35.s | 28 ++-- asm/ov36.inc | 2 +- asm/ov36.s | 14 +- asm/ov37.inc | 2 +- asm/ov37.s | 16 +- asm/ov38.inc | 2 +- asm/ov38.s | 6 +- asm/ov39.inc | 2 +- asm/ov39.s | 14 +- asm/ov41.inc | 2 +- asm/ov41.s | 2 +- asm/ov43.inc | 2 +- asm/ov43.s | 4 +- asm/ov44.inc | 2 +- asm/ov44.s | 10 +- asm/ov47.inc | 2 +- asm/ov47.s | 6 +- asm/ov48.inc | 2 +- asm/ov48.s | 8 +- asm/ov50.inc | 2 +- asm/ov50.s | 18 +-- asm/ov51.inc | 2 +- asm/ov51.s | 10 +- asm/ov59.inc | 2 +- asm/ov59.s | 8 +- include/lib/math.h | 4 + 96 files changed, 443 insertions(+), 439 deletions(-) diff --git a/asm/itcm.s b/asm/itcm.s index 7832436b..fd843546 100644 --- a/asm/itcm.s +++ b/asm/itcm.s @@ -2498,9 +2498,9 @@ _01ffa0ec: .word 0xffffda4d _01ffa0f0: .word data_02054f54 arm_func_end func_01ff9f3c - .global func_01ffa0f4 - arm_func_start func_01ffa0f4 -func_01ffa0f4: ; 0x01ffa0f4 + .global Atan2 + arm_func_start Atan2 +Atan2: ; 0x01ffa0f4 stmdb sp!, {r4, lr} cmp r0, #0 ble _01ffa188 @@ -2624,7 +2624,7 @@ _01ffa274: ldmia sp!, {r4, pc} .align 2, 0 _01ffa298: .word data_02055058 - arm_func_end func_01ffa0f4 + arm_func_end Atan2 .global func_01ffa29c arm_func_start func_01ffa29c diff --git a/asm/main/main_02000000.inc b/asm/main/main_02000000.inc index 63ffb85d..69fcba78 100644 --- a/asm/main/main_02000000.inc +++ b/asm/main/main_02000000.inc @@ -282,7 +282,7 @@ .extern Vec3p_Normalize .extern func_01ff9ec0 .extern func_01ff9f3c -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa29c .extern func_01ffa2dc .extern func_01ffa34c diff --git a/asm/main/main_02000000.s b/asm/main/main_02000000.s index 12107442..c379a8b2 100644 --- a/asm/main/main_02000000.s +++ b/asm/main/main_02000000.s @@ -57341,7 +57341,7 @@ func_0202b03c: ; 0x0202b03c bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 sub r0, r7, r0, asr #16 mov r0, r0, lsl #0x10 @@ -57888,13 +57888,13 @@ func_0202b734: ; 0x0202b734 bl func_01ff9ac4 mov r0, r5 mov r1, r7 - bl func_01ffa0f4 + bl Atan2 ldr r1, [sp, #0x20] strh r0, [r1] bl func_01ff9af8 mov r1, r0 mov r0, r6 - bl func_01ffa0f4 + bl Atan2 strh r0, [r9] ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc} arm_func_end func_0202b734 diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc index cbac3fe9..5a010763 100644 --- a/asm/ov00/Actor/Actor.inc +++ b/asm/ov00/Actor/Actor.inc @@ -38,7 +38,7 @@ .extern Vec3p_Sub .extern Vec3p_Length .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffbe34 .extern func_01ffec34 .extern func_01fffcec diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s index ff4caf08..9c322cff 100644 --- a/asm/ov00/Actor/Actor.s +++ b/asm/ov00/Actor/Actor.s @@ -1169,7 +1169,7 @@ _ZN5Actor18CollidesWithShieldEP8Cylinder: ; 0x020c2238 ldr r0, [sp] ldrsh r4, [r1] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 rsbs r0, r4, r0, asr #16 rsbmi r0, r0, #0 @@ -1726,7 +1726,7 @@ _ZN5Actor10GetAngleToEP5Vec3p: ; 0x020c2938 subs r0, r3, r2 cmpeq r1, #0 beq _020c296c - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r4, r0, asr #0x10 _020c296c: diff --git a/asm/ov00/Player/LinkStateBase.inc b/asm/ov00/Player/LinkStateBase.inc index 5364bc3d..80dd9506 100644 --- a/asm/ov00/Player/LinkStateBase.inc +++ b/asm/ov00/Player/LinkStateBase.inc @@ -24,7 +24,7 @@ .extern gActorManager .extern data_027e0fe8 .extern Vec3p_Sub -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffe468 .extern func_01fffcd8 .extern func_0202b154 diff --git a/asm/ov00/Player/LinkStateBase.s b/asm/ov00/Player/LinkStateBase.s index a9fcaf71..8c75f137 100644 --- a/asm/ov00/Player/LinkStateBase.s +++ b/asm/ov00/Player/LinkStateBase.s @@ -728,7 +728,7 @@ _ZN13LinkStateBase18func_ov00_020a8704EPs: ; 0x020a8704 beq _020a876c ldr r0, [r5, #0x64] ldr r1, [r5, #0x6c] - bl func_01ffa0f4 + bl Atan2 mov r5, r0, lsl #0x10 mov r0, r6 bl _ZN13LinkStateBase14GetPlayerAngleEv @@ -785,7 +785,7 @@ _ZN13LinkStateBase18func_ov00_020a8774EP5Vec3pi: ; 0x020a8774 add r1, r2, r1 str r0, [sp] str r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 rsb r0, r4, r0, asr #16 mov r0, r0, lsl #0x10 diff --git a/asm/ov00/Player/LinkStateDamage.inc b/asm/ov00/Player/LinkStateDamage.inc index 65cd416a..ea53c577 100644 --- a/asm/ov00/Player/LinkStateDamage.inc +++ b/asm/ov00/Player/LinkStateDamage.inc @@ -43,7 +43,7 @@ .extern data_ov00_020eec68 .extern data_ov00_020eec9c .extern Vec3p_Add -.extern func_01ffa0f4 +.extern Atan2 .extern func_02019534 .extern func_0201e388 .extern func_0202d95c diff --git a/asm/ov00/Player/LinkStateDamage.s b/asm/ov00/Player/LinkStateDamage.s index 7561856a..d4f7b6e6 100644 --- a/asm/ov00/Player/LinkStateDamage.s +++ b/asm/ov00/Player/LinkStateDamage.s @@ -965,7 +965,7 @@ _020acbb0: str r0, [sp] str r2, [sp, #4] str r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r7, r0, lsl #0x10 mov r0, r6 mov r4, r7, asr #0x10 @@ -1049,7 +1049,7 @@ _020acce4: str r1, [r0, #8] ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r4, r0 mov r0, r6 bl _ZN13LinkStateBase14GetPlayerAngleEv @@ -1173,7 +1173,7 @@ _ZN15LinkStateDamage18func_ov00_020ace90EP5Vec3pi: ; 0x020ace90 str r1, [r0, #8] ldr r0, [r6] ldr r1, [r6, #8] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r5 mov r6, r1, asr #0x10 diff --git a/asm/ov00/Player/LinkStateInteract.inc b/asm/ov00/Player/LinkStateInteract.inc index 05cc6433..0d6087fa 100644 --- a/asm/ov00/Player/LinkStateInteract.inc +++ b/asm/ov00/Player/LinkStateInteract.inc @@ -51,7 +51,7 @@ .extern Vec3p_Sub .extern Vec3p_Length .extern Vec3p_Axpy -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffbe78 .extern func_01fffcd8 .extern func_0202bba8 diff --git a/asm/ov00/Player/LinkStateInteract.s b/asm/ov00/Player/LinkStateInteract.s index 5d2bf5fc..53ace999 100644 --- a/asm/ov00/Player/LinkStateInteract.s +++ b/asm/ov00/Player/LinkStateInteract.s @@ -307,7 +307,7 @@ _020aa5d4: bl func_ov00_020d7b20 ldr r0, [r4, #0x18] ldr r1, [r4, #0x20] - bl func_01ffa0f4 + bl Atan2 mov r5, r0 mov r0, r4 bl _ZN13LinkStateBase14GetPlayerAngleEv @@ -327,7 +327,7 @@ _020aa634: beq _020aa674 ldr r0, [r4, #0x18] ldr r1, [r4, #0x20] - bl func_01ffa0f4 + bl Atan2 mov r5, r0 mov r0, r4 bl _ZN13LinkStateBase14GetPlayerAngleEv @@ -1039,7 +1039,7 @@ _020ab060: bge _020ab1d8 ldr r0, [sp, #0x50] ldr r1, [sp, #0x58] - bl func_01ffa0f4 + bl Atan2 ldr r1, _020ab3dc ; =0x00001ccd mov r0, r0, lsl #0x10 cmp r5, r1 @@ -1152,7 +1152,7 @@ _020ab1e4: beq _020ab278 ldr r0, [sp, #0x34] ldr r1, [sp, #0x3c] - bl func_01ffa0f4 + bl Atan2 mov r6, r0, lsl #0x10 mov r0, r6, asr #0x10 bl func_0202bbbc @@ -1621,7 +1621,7 @@ _020ab818: add r2, r1, #0x66 ldr r1, [sp, #0x18] add r4, r2, #0x600 - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl func_0202bbbc diff --git a/asm/ov00/Player/PlayerBase.inc b/asm/ov00/Player/PlayerBase.inc index 452c9187..eeb558b8 100644 --- a/asm/ov00/Player/PlayerBase.inc +++ b/asm/ov00/Player/PlayerBase.inc @@ -16,7 +16,7 @@ .extern data_027e0fb8 .extern gActorManager .extern Vec3p_Sub -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffec34 .extern func_01fffcec .extern func_ov00_0207c5d4 diff --git a/asm/ov00/Player/PlayerBase.s b/asm/ov00/Player/PlayerBase.s index 5b771356..9cbae5d6 100644 --- a/asm/ov00/Player/PlayerBase.s +++ b/asm/ov00/Player/PlayerBase.s @@ -105,7 +105,7 @@ _ZN10PlayerBase6LookAtEP5Vec3p: ; 0x020a7bac ldmeqia sp!, {pc} ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 ldr r1, _020a7bfc ; =gPlayerAngle strh r0, [r1] add sp, sp, #0xc diff --git a/asm/ov00/Player/PlayerControl.inc b/asm/ov00/Player/PlayerControl.inc index f8319fab..16a05cdd 100644 --- a/asm/ov00/Player/PlayerControl.inc +++ b/asm/ov00/Player/PlayerControl.inc @@ -46,7 +46,7 @@ .extern Vec3p_Length .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffe468 .extern func_02002c14 .extern func_0202b2e8 diff --git a/asm/ov00/Player/PlayerControl.s b/asm/ov00/Player/PlayerControl.s index 5821e3d4..54f494a5 100644 --- a/asm/ov00/Player/PlayerControl.s +++ b/asm/ov00/Player/PlayerControl.s @@ -2273,7 +2273,7 @@ _020b0c5c: ble _020b0cd8 ldr r0, [r7, #0x50] ldr r1, [r7, #0x54] - bl func_01ffa0f4 + bl Atan2 ldr r1, [sp, #0x38] ldrsh r2, [r6] cmp r1, #0 @@ -2292,7 +2292,7 @@ _020b0c5c: _020b0cd8: ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] - bl func_01ffa0f4 + bl Atan2 ldrsh lr, [r6] add r1, sp, #0xc mov ip, #0 diff --git a/asm/ov00/ov00_02086cd0.inc b/asm/ov00/ov00_02086cd0.inc index 4e30e242..3edd19a7 100644 --- a/asm/ov00/ov00_02086cd0.inc +++ b/asm/ov00/ov00_02086cd0.inc @@ -170,7 +170,7 @@ .extern Vec3p_Length .extern Vec3p_Normalize .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa8d4 .extern func_01ffa9fc .extern func_01ffb7ec diff --git a/asm/ov00/ov00_02086cd0.s b/asm/ov00/ov00_02086cd0.s index d515afcc..462b4184 100644 --- a/asm/ov00/ov00_02086cd0.s +++ b/asm/ov00/ov00_02086cd0.s @@ -5002,7 +5002,7 @@ _0208af04: bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 str r0, [sp, #0x48] @@ -5803,7 +5803,7 @@ func_ov00_0208b930: ; 0x0208b930 bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 add sp, sp, #0x18 @@ -14207,7 +14207,7 @@ _02092368: ldr r0, [sp, #0x38] ldr r6, [r1, #0x15c] ldr r1, [sp, #0x40] - bl func_01ffa0f4 + bl Atan2 mov r4, r0, lsl #0x10 mov r0, r6 bl func_ov00_02087d84 @@ -14228,7 +14228,7 @@ _020923dc: ldr r0, [sp, #0x2c] ldr r6, [r1, #0x15c] ldr r1, [sp, #0x34] - bl func_01ffa0f4 + bl Atan2 mov r4, r0, lsl #0x10 mov r0, r6 bl func_ov00_02087d84 @@ -14257,7 +14257,7 @@ _0209242c: ldr r0, [sp, #0x14] ldr r7, [r1, #0x15c] ldr r1, [sp, #0x1c] - bl func_01ffa0f4 + bl Atan2 mov r6, r0, lsl #0x10 mov r0, r7 bl func_ov00_02087d84 @@ -14526,7 +14526,7 @@ _02092824: ldr r0, [sp, #0xc4] ldr r7, [r1, #0x15c] ldr r1, [sp, #0xcc] - bl func_01ffa0f4 + bl Atan2 mov r5, r0, lsl #0x10 mov r0, r7 bl func_ov00_02087d84 @@ -14609,7 +14609,7 @@ _0209295c: ldr r0, [sp, #0xac] ldr r7, [r1, #0x15c] ldr r1, [sp, #0xb4] - bl func_01ffa0f4 + bl Atan2 mov r5, r0, lsl #0x10 mov r0, r7 bl func_ov00_02087d84 @@ -14633,7 +14633,7 @@ _020929c8: ldr r0, [sp, #0xa0] ldr r7, [r1, #0x15c] ldr r1, [sp, #0xa8] - bl func_01ffa0f4 + bl Atan2 mov r5, r0, lsl #0x10 mov r0, r7 bl func_ov00_02087d84 @@ -14669,7 +14669,7 @@ _02092a50: ldr r0, [sp, #0x94] ldr r7, [r1, #0x15c] ldr r1, [sp, #0x9c] - bl func_01ffa0f4 + bl Atan2 mov r5, r0, lsl #0x10 mov r0, r7 bl func_ov00_02087d84 diff --git a/asm/ov00/ov00_020980f4.inc b/asm/ov00/ov00_020980f4.inc index dbaa88d4..516220b5 100644 --- a/asm/ov00/ov00_020980f4.inc +++ b/asm/ov00/ov00_020980f4.inc @@ -145,7 +145,7 @@ .extern Vec3p_Normalize .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa8d4 .extern func_01ffbf5c .extern func_01ffe1cc diff --git a/asm/ov00/ov00_020980f4.s b/asm/ov00/ov00_020980f4.s index 69e04dd3..171664ae 100644 --- a/asm/ov00/ov00_020980f4.s +++ b/asm/ov00/ov00_020980f4.s @@ -4833,7 +4833,7 @@ func_ov00_0209bea0: ; 0x0209bea0 ldr r0, [sp] ldr r1, [sp, #8] ldrsh r5, [r2] - bl func_01ffa0f4 + bl Atan2 mov r0, r4 bl func_ov00_02090a7c ldr r1, [r0, #0x30] @@ -6165,7 +6165,7 @@ func_ov00_0209cf64: ; 0x0209cf64 bl func_ov00_02090e10 ldr r0, [sp, #0x30] ldr r1, [sp, #0x38] - bl func_01ffa0f4 + bl Atan2 add r1, sp, #0x3c mov r0, r4 bl func_ov00_02090c28 @@ -12999,7 +12999,7 @@ _020a23d8: mov r6, r0 ldr r0, [sp, #0x1c] ldr r1, [sp, #0x24] - bl func_01ffa0f4 + bl Atan2 mov r10, r0, lsl #0x10 add r0, sp, #0x1c add r3, sp, #4 @@ -13014,7 +13014,7 @@ _020a23d8: rsb r1, r1, #0 str r0, [sp, #4] str r1, [sp, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 ldr r0, [sp, #0x104] @@ -18565,7 +18565,7 @@ _020a6ae0: bl Vec3p_Sub ldr r0, [sp, #0x58] ldr r1, [sp, #0x60] - bl func_01ffa0f4 + bl Atan2 mov r2, r0, lsl #0x10 add r1, sp, #0x7c mov r0, r10 @@ -18614,7 +18614,7 @@ _020a6b9c: bl Vec3p_Sub ldr r0, [sp, #0x40] ldr r1, [sp, #0x48] - bl func_01ffa0f4 + bl Atan2 ldr r1, _020a6de4 ; =gPlayerPos mov r0, r0, lsl #0x10 ldr r2, [r1] diff --git a/asm/ov00/ov00_020b1498.inc b/asm/ov00/ov00_020b1498.inc index 057d9ec9..ea8fd04b 100644 --- a/asm/ov00/ov00_020b1498.inc +++ b/asm/ov00/ov00_020b1498.inc @@ -235,7 +235,7 @@ .extern Vec3p_Normalize .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa9fc .extern func_01ffb7ec .extern func_01ffbf5c diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index 22417dab..f1af26fe 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -2027,7 +2027,7 @@ _020b2db8: beq _020b2e68 ldr r0, [sp, #8] ldr r1, [sp, #0x10] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r4 mov r6, r1, asr #0x10 @@ -4502,7 +4502,7 @@ func_ov00_020b4c2c: ; 0x020b4c2c mov r1, r0 ldr r0, [r1, #0x120] ldr r1, [r1, #0x128] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 ldmia sp!, {r3, pc} @@ -5272,7 +5272,7 @@ _020b5540: mov r8, r0 ldr r0, [sp, #0x64] ldr r1, [sp, #0x6c] - bl func_01ffa0f4 + bl Atan2 strh r0, [sp, #2] ldr r2, _020b5c84 ; =0x0000071c mov r1, r8 @@ -5657,7 +5657,7 @@ _020b5b40: beq _020b5c18 ldr r0, [r5] ldr r1, [r5, #8] - bl func_01ffa0f4 + bl Atan2 strh r0, [r6, #0x5e] b _020b5c18 _020b5b70: @@ -7534,11 +7534,11 @@ _020b75b0: beq _020b7714 ldr r0, [r6, #0x44] ldr r1, [r6, #0x4c] - bl func_01ffa0f4 + bl Atan2 mov r7, r0, lsl #0x10 ldr r0, [sp, #0x14] ldr r1, [sp, #0x1c] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 sub r0, r0, r7, asr #16 @@ -7546,7 +7546,7 @@ _020b75b0: ldr r0, [sp, #8] ldr r1, [sp, #0x10] mov r4, r2, asr #0x10 - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 sub r0, r0, r7, asr #16 @@ -7938,7 +7938,7 @@ _020b7be0: ldrsh r5, [r0, #0x26] ldr r0, [sp, #0x20] ldr r1, [sp, #0x28] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 add r0, r5, r0, asr #16 strh r0, [r4, #0x6a] @@ -7991,11 +7991,11 @@ _020b7c9c: beq _020b7d0c mov r0, r1, lsl #0xc mov r1, r2, lsl #0xc - bl func_01ffa0f4 + bl Atan2 mov r5, r0, lsl #0x10 ldr r0, [r4, #0x50] ldr r1, [r4, #0x54] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 rsb r0, r0, r5, asr #16 @@ -9614,7 +9614,7 @@ _020b8d78: bl func_0202b4e4 ldr r0, [r4, #0x60] ldr r1, [r4, #0x68] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 cmp r6, #0 mov r5, r0, asr #0x10 @@ -9642,7 +9642,7 @@ _020b8d78: _020b8e80: ldr r0, [sp, #8] ldr r1, [sp, #0x10] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 rsb r0, r5, r0, asr #16 mov r0, r0, lsl #0x10 @@ -12774,7 +12774,7 @@ func_ov00_020bb604: ; 0x020bb604 ldmleia sp!, {r3, r4, r5, r6, pc} ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 ldr r1, [sp, #0x30] strh r0, [r1] add sp, sp, #0x1c @@ -12865,7 +12865,7 @@ func_ov00_020bb6d4: ; 0x020bb6d4 orr r0, r0, r1, lsl #20 ldr r1, [sp, #8] str r0, [sp, #0xc] - bl func_01ffa0f4 + bl Atan2 rsb r0, r0, #0 mov r1, r0, lsl #0x10 ldr r2, _020bb80c ; =data_027e0fcc @@ -12927,7 +12927,7 @@ func_ov00_020bb810: ; 0x020bb810 orr r0, r0, r1, lsl #20 ldr r1, [sp, #8] str r0, [sp, #0xc] - bl func_01ffa0f4 + bl Atan2 rsb r0, r0, #0 mov r1, r0, lsl #0x10 ldr r2, _020bb8c0 ; =data_027e0fcc @@ -12966,7 +12966,7 @@ func_ov00_020bb8c4: ; 0x020bb8c4 bl func_ov00_020b4558 ldr r0, [sp, #0xc] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 rsb r0, r0, #0 mov r1, r0, lsl #0x10 ldr r2, _020bb940 ; =data_027e0fcc @@ -12994,7 +12994,7 @@ func_ov00_020bb948: ; 0x020bb948 bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 ldr r0, _020bb9a4 ; =gPlayerAngle ldr r2, _020bb9a8 ; =0x0000071c @@ -13763,7 +13763,7 @@ func_ov00_020bc228: ; 0x020bc228 ldmeqia sp!, {r3, pc} ldr r0, [r1] ldr r1, [r1, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 ldr r0, _020bc278 ; =gPlayerAngle @@ -14045,7 +14045,7 @@ func_ov00_020bc520: ; 0x020bc520 ldr r0, [sp] ldrsh r6, [r1] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 rsb r0, r6, r0, asr #16 mov r0, r0, lsl #0x10 @@ -16189,7 +16189,7 @@ _020bdf28: ldr r1, [sp, #4] sub r0, r3, r0 sub r1, r2, r1 - bl func_01ffa0f4 + bl Atan2 ldr r2, [r4, #8] ldr r1, [r4] add r1, r2, r1, lsl #4 @@ -16281,7 +16281,7 @@ _020be08c: ldr r1, [sp, #0x14] sub r0, r3, r0 sub r1, r2, r1 - bl func_01ffa0f4 + bl Atan2 ldr r1, [r9, #8] add r1, r1, r8, lsl #4 strh r0, [r1, #0xc] @@ -16317,7 +16317,7 @@ _020be158: ldr r1, [sp, #0x14] sub r0, r3, r0 sub r1, r2, r1 - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 ldr r1, [r9, #8] mov r2, r0, asr #0x10 @@ -18269,11 +18269,11 @@ _020bf9a0: beq _020bfa1c ldr r0, [sp, #0xb4] ldr r1, [sp, #0xbc] - bl func_01ffa0f4 + bl Atan2 mov r5, r0, lsl #0x10 ldr r0, [sp, #0x100] ldr r1, [sp, #0x108] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 subs r0, r0, r5, asr #16 diff --git a/asm/ov00/ov00_020c3e54.inc b/asm/ov00/ov00_020c3e54.inc index ecec4ec0..a6cb7c85 100644 --- a/asm/ov00/ov00_020c3e54.inc +++ b/asm/ov00/ov00_020c3e54.inc @@ -336,7 +336,7 @@ .extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ff9f3c -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa8d4 .extern func_01ffbe34 .extern func_01ffbe78 diff --git a/asm/ov00/ov00_020c3e54.s b/asm/ov00/ov00_020c3e54.s index c951bc01..7e0b6ebf 100644 --- a/asm/ov00/ov00_020c3e54.s +++ b/asm/ov00/ov00_020c3e54.s @@ -959,7 +959,7 @@ _020c49fc: bl Vec3p_Sub ldr r0, [sp, #0x14] ldr r1, [sp, #0x1c] - bl func_01ffa0f4 + bl Atan2 ldrsh r1, [r6, #0x14] mov r0, r0, lsl #0x10 rsb r0, r1, r0, asr #16 @@ -1733,7 +1733,7 @@ func_ov00_020c53b0: ; 0x020c53b0 bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 add sp, sp, #0xc @@ -1844,7 +1844,7 @@ func_ov00_020c54a0: ; 0x020c54a0 ldmgtia sp!, {r4, r5, r6, r7, pc} ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 rsb r0, r6, r0, asr #16 mov r0, r0, lsl #0x10 @@ -2847,7 +2847,7 @@ _020c61b4: _020c61d0: ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 ldr r3, [sp, #8] ldr lr, [sp] smull r1, r2, r3, r3 @@ -2958,7 +2958,7 @@ _020c6348: _020c6368: ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r5, r0, asr #0x10 mov r0, r7 @@ -3136,7 +3136,7 @@ _020c65a4: mov r4, r0 ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -3526,7 +3526,7 @@ _020c6a60: mov r1, r11 sub r0, r2, r0 str r0, [sp, #4] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r6, r0, asr #0x10 ldr r3, [r8, #4] @@ -3535,7 +3535,7 @@ _020c6a60: ldr r1, [r10, #0xc] sub r0, r3, r0 sub r1, r2, r1 - bl func_01ffa0f4 + bl Atan2 mov r8, r0, lsl #0x10 ldr r3, [r9, #4] ldr r0, [r10, #4] @@ -3543,7 +3543,7 @@ _020c6a60: ldr r1, [r10, #0xc] sub r0, r3, r0 sub r1, r2, r1 - bl func_01ffa0f4 + bl Atan2 ldr r1, [sp, #4] cmp r1, #0 cmpeq r11, #0 @@ -6188,7 +6188,7 @@ _020c8d94: bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 ldrsh r1, [r6, #2] mov r0, r0, lsl #0x10 sub r0, r1, r0, asr #16 @@ -9371,7 +9371,7 @@ _020cb47c: bl _ZN5Actor9GetHitboxEP8Cylinder ldr r0, [r6] ldr r1, [r6, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -11723,7 +11723,7 @@ func_ov00_020cd174: ; 0x020cd174 bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 cmp r5, #0 mov r0, r0, asr #0x10 @@ -11898,7 +11898,7 @@ func_ov00_020cd384: ; 0x020cd384 bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 cmp r6, #0 @@ -12120,7 +12120,7 @@ _020cd690: bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 ldr r1, _020cd8d8 ; =data_027e0764 mov r0, r0, lsl #0x10 ldr r6, [r1] @@ -12186,7 +12186,7 @@ _020cd7d4: bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 ldr r11, _020cd8d8 ; =data_027e0764 mov r0, r0, lsl #0x10 ldr r6, [r11, #8] @@ -12366,7 +12366,7 @@ func_ov00_020cda0c: ; 0x020cda0c str r0, [r2, #0x64] ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 ldr r1, [r4] strh r0, [r1, #0x78] add sp, sp, #0xc @@ -12595,7 +12595,7 @@ func_ov00_020cdcf8: ; 0x020cdcf8 ldmgtia sp!, {r4, pc} ldr r0, [r1, #0xc4] ldr r1, [r1, #0xcc] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl func_0202bc10 @@ -12918,7 +12918,7 @@ func_ov00_020ce18c: ; 0x020ce18c ldmia sp!, {r3, r4, r5, pc} _020ce230: ldr r1, [r2, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 diff --git a/asm/ov03.inc b/asm/ov03.inc index 8f4fb775..095ab378 100644 --- a/asm/ov03.inc +++ b/asm/ov03.inc @@ -128,7 +128,7 @@ .extern func_01ff9b24 .extern func_01ff9b4c .extern func_01ff9b88 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa8d4 .extern func_01ffb7ec .extern func_01ffbe34 diff --git a/asm/ov03.s b/asm/ov03.s index 751f52fa..5492a6ad 100644 --- a/asm/ov03.s +++ b/asm/ov03.s @@ -1055,7 +1055,7 @@ _020ef474: add r2, r7, #0 ldrsh r2, [r6, r2] sub r1, r1, r2 - blx func_01ffa0f4 + blx Atan2 str r0, [sp, #0x5c] b _020ef524 _020ef4b8: @@ -1114,7 +1114,7 @@ _020ef50e: ldrsh r2, [r5, r1] ldr r1, [sp, #0xc] sub r1, r2, r1 - blx func_01ffa0f4 + blx Atan2 str r0, [sp, #0x5c] _020ef524: ldr r0, [sp, #0x40] @@ -1180,7 +1180,7 @@ _020ef58e: ldrsh r2, [r5, r1] ldr r1, [sp, #4] sub r1, r2, r1 - blx func_01ffa0f4 + blx Atan2 str r0, [sp, #0x5c] b _020ef5e4 _020ef5a6: @@ -1209,7 +1209,7 @@ _020ef5a6: ldrsh r2, [r5, r2] sub r1, r3, r1 sub r0, r0, r2 - blx func_01ffa0f4 + blx Atan2 str r0, [sp, #0x5c] b _020ef5e4 _020ef5e0: @@ -2205,7 +2205,7 @@ _020efcc6: lsl r0, r0, #0xc sub r1, r1, r2 lsl r1, r1, #0xc - blx func_01ffa0f4 + blx Atan2 str r0, [sp, #0x1c] b _020efdee _020efce6: @@ -2264,7 +2264,7 @@ _020efd1a: lsl r0, r0, #0xc sub r1, r2, r1 lsl r1, r1, #0xc - blx func_01ffa0f4 + blx Atan2 ldr r1, [sp, #0x1c] sub r0, r1, r0 lsl r0, r0, #0x10 @@ -2285,7 +2285,7 @@ _020efd5c: lsl r0, r0, #0xc sub r1, r2, r1 lsl r1, r1, #0xc - blx func_01ffa0f4 + blx Atan2 str r0, [sp, #0x1c] lsl r0, r5, #1 strh r6, [r7, r0] @@ -2297,7 +2297,7 @@ _020efd82: _020efd88: lsl r0, r2, #0xc lsl r1, r1, #0xc - blx func_01ffa0f4 + blx Atan2 ldr r1, [sp, #0x1c] sub r1, r1, r0 lsl r1, r1, #0x10 diff --git a/asm/ov04.inc b/asm/ov04.inc index 80301d19..a3f297a7 100644 --- a/asm/ov04.inc +++ b/asm/ov04.inc @@ -275,7 +275,7 @@ .extern Vec3p_Add .extern Vec3p_Sub .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa8d4 .extern func_01ffec78 .extern func_02002bf4 diff --git a/asm/ov04.s b/asm/ov04.s index 5468dab5..0f9a2c25 100644 --- a/asm/ov04.s +++ b/asm/ov04.s @@ -11355,7 +11355,7 @@ _021063a4: blx Vec3p_Sub ldr r0, [sp, #0x1c] ldr r1, [sp, #0x24] - blx func_01ffa0f4 + blx Atan2 strh r0, [r4] add r7, r7, #1 add r5, r5, #4 diff --git a/asm/ov05.inc b/asm/ov05.inc index dd6d9b21..a1942627 100644 --- a/asm/ov05.inc +++ b/asm/ov05.inc @@ -267,7 +267,7 @@ .extern Vec3p_Length .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa8d4 .extern func_01ffa9fc .extern func_01ffbe34 diff --git a/asm/ov05.s b/asm/ov05.s index c51811c3..ec163163 100644 --- a/asm/ov05.s +++ b/asm/ov05.s @@ -12121,7 +12121,7 @@ _0210ac7c: bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r6 mov r4, r1, asr #0x10 @@ -12145,7 +12145,7 @@ _0210ad00: bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r6 mov r4, r1, asr #0x10 @@ -16974,7 +16974,7 @@ _0210ef74: ldr r1, [r0] ldrsh r0, [r1, #0x72] ldrsh r1, [r1, #0x74] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -17638,7 +17638,7 @@ func_ov05_0210f808: ; 0x0210f808 bl Vec3p_Sub ldr r0, [sp, #0x2c] ldr r1, [sp, #0x34] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r5, r0, asr #0x10 b _0210f89c @@ -17699,7 +17699,7 @@ _0210f8dc: mov r1, r0 ldr r0, [r1, #0x114] ldr r1, [r1, #0x11c] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 sub r0, r0, #0x8000 @@ -17842,7 +17842,7 @@ _0210fa80: beq _0210fbf0 ldr r0, [sp, #0x40] ldr r1, [sp, #0x48] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 sub r1, r5, r0, asr #16 mov r1, r1, lsl #0x10 @@ -17931,7 +17931,7 @@ _0210fc74: bl _ZN13LinkStateBase18func_ov00_020a8294Eij ldr r0, [sp, #0x20] ldr r1, [sp, #0x28] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 sub r0, r0, #0x8000 @@ -20135,7 +20135,7 @@ func_ov05_02111af8: ; 0x02111af8 ldrsh r6, [r5, #0x18] ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 rsb r0, r6, r0, asr #16 mov r0, r0, lsl #0x10 diff --git a/asm/ov12.inc b/asm/ov12.inc index 06af23c5..5b97a28b 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -203,7 +203,7 @@ .extern Vec3p_Normalize .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa9fc .extern func_01ffbe34 .extern func_01ffbe78 diff --git a/asm/ov12.s b/asm/ov12.s index 5e7bcb37..d4c6848a 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -2853,7 +2853,7 @@ func_ov12_0211514c: ; 0x0211514c _02115174: ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 ldrsh r1, [r5, #0x78] mov r0, r0, lsl #0x10 sub r0, r1, r0, asr #16 @@ -34623,7 +34623,7 @@ _0212ed88: beq _0212ee30 mov r2, #1 strb r2, [r5, #0x165] - bl func_01ffa0f4 + bl Atan2 add r1, r5, #0x100 strh r0, [r1, #0x68] ldrsh r2, [r5, #0x78] diff --git a/asm/ov14/ov14_0211f640.inc b/asm/ov14/ov14_0211f640.inc index cc49c033..c7f19c39 100644 --- a/asm/ov14/ov14_0211f640.inc +++ b/asm/ov14/ov14_0211f640.inc @@ -213,7 +213,7 @@ .extern Vec3p_Normalize .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa9fc .extern func_01ffbe34 .extern func_01ffbe78 diff --git a/asm/ov14/ov14_0211f640.s b/asm/ov14/ov14_0211f640.s index 4df526f0..7685af21 100644 --- a/asm/ov14/ov14_0211f640.s +++ b/asm/ov14/ov14_0211f640.s @@ -1036,7 +1036,7 @@ _02120248: bl func_ov00_020ceacc ldr r0, [r4, #0x60] ldr r1, [r4, #0x68] - bl func_01ffa0f4 + bl Atan2 strh r0, [r4, #0x78] mov r0, #0 str r0, [r4, #0x19c] @@ -1196,7 +1196,7 @@ _021204e4: _021204f0: ldr r0, [r6, #0xc4] ldr r1, [r6, #0xcc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r6 mov r1, r1, asr #0x10 @@ -1229,7 +1229,7 @@ _02120560: beq _0212058c ldr r0, [r6, #0xc4] ldr r1, [r6, #0xcc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r6 mov r1, r1, asr #0x10 @@ -1756,7 +1756,7 @@ func_ov14_02120c98: ; 0x02120c98 bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 mov r0, r1, lsl #0x10 @@ -1911,7 +1911,7 @@ _02120e94: bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r4 mov r1, r1, asr #0x10 @@ -3501,11 +3501,11 @@ _02122488: beq _02122510 ldr r0, [sp, #0x80] ldr r1, [sp, #0x88] - bl func_01ffa0f4 + bl Atan2 mov r6, r0, lsl #0x10 ldr r0, [r5, #0x60] ldr r1, [r5, #0x68] - bl func_01ffa0f4 + bl Atan2 ldr r1, [r5, #0x60] mov r0, r0, lsl #0x10 str r1, [sp, #0x74] @@ -3592,7 +3592,7 @@ _021225cc: bl Vec3p_Sub ldr r0, [sp, #0x68] ldr r1, [sp, #0x70] - bl func_01ffa0f4 + bl Atan2 add r1, r5, #0x200 strh r0, [r1, #0x68] ldrsh r2, [r1, #0x68] @@ -5384,7 +5384,7 @@ func_ov14_02123cd0: ; 0x02123cd0 beq _02123e08 ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 strh r0, [r4, #0x78] add sp, sp, #0xc mov r0, #0 @@ -5409,7 +5409,7 @@ _02123d9c: beq _02123e08 ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 sub r0, r0, #0x8000 @@ -6125,7 +6125,7 @@ _02124724: bl Vec3p_Add ldr r0, [r5, #0x60] ldr r1, [r5, #0x68] - bl func_01ffa0f4 + bl Atan2 strh r0, [r5, #0x78] add r0, r5, #0x100 ldrsh r1, [r0, #0x7c] @@ -16934,7 +16934,7 @@ _0212d2b0: str r2, [r5, #0x78] ldr r0, [r4] ldr r1, [r4, #8] - bl func_01ffa0f4 + bl Atan2 strh r0, [r5, #0x62] mov r0, #0 strh r0, [r5, #0x5c] diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index a7022ccc..8f71cb52 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -234,7 +234,7 @@ .extern Vec3p_Length .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa9fc .extern func_01ffbe34 .extern func_01ffbe78 diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s index a1d8e133..864c6605 100644 --- a/asm/ov14/ov14_0213b778.s +++ b/asm/ov14/ov14_0213b778.s @@ -2749,7 +2749,7 @@ func_ov14_0213d63c: ; 0x0213d63c ldr r1, [r4, #8] sub r0, r3, r0 sub r1, r2, r1 - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 ldmia sp!, {r4, pc} @@ -3658,7 +3658,7 @@ func_ov14_0213e20c: ; 0x0213e20c bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 ldrsh r1, [r5, #0xc] mov r0, r0, lsl #0x10 sub r0, r1, r0, asr #16 @@ -3927,7 +3927,7 @@ _0213e62c: ldr r1, [sp, #0x40] sub r0, r0, r8 sub r1, r1, r9 - bl func_01ffa0f4 + bl Atan2 mov r2, r10, lsl #0x1 ldr r8, [sp, #0x4c] ldr r1, [sp, #0x44] @@ -19586,7 +19586,7 @@ _0214a77c: sub r0, r5, r0 sub r1, r3, r1 mov r5, r2, asr #0x10 - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 rsb r1, r8, r0, asr #16 mov r1, r1, lsl #0x10 @@ -19618,7 +19618,7 @@ _0214a808: bl func_ov00_020ce2f0 mov r1, r0 mov r0, r11 - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 cmp r9, #0 mov r9, r0, asr #0x10 @@ -21145,7 +21145,7 @@ func_ov14_0214bbdc: ; 0x0214bbdc bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 ldr r1, _0214bc94 ; =0x00000fa5 mov r2, r0, asr #0x10 @@ -21286,7 +21286,7 @@ func_ov14_0214bd7c: ; 0x0214bd7c bl Vec3p_Sub ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 ldr r1, _0214be60 ; =0x00003555 mov r2, r0, asr #0x10 @@ -21907,7 +21907,7 @@ func_ov14_0214c55c: ; 0x0214c55c bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r4, r0, asr #0x10 ldrsh r2, [sp, #0x28] @@ -22188,7 +22188,7 @@ func_ov14_0214c948: ; 0x0214c948 bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r5, r0, asr #0x10 ldrsh r2, [sp, #0x28] @@ -27858,7 +27858,7 @@ func_ov14_02151084: ; 0x02151084 str r0, [sp] str r2, [sp, #4] str r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 movs r1, r0, asr #0x10 bmi _02151104 diff --git a/asm/ov15.inc b/asm/ov15.inc index c955cb4e..dfa1051f 100644 --- a/asm/ov15.inc +++ b/asm/ov15.inc @@ -301,7 +301,7 @@ .extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ff9f3c -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa8d4 .extern func_01ffa9fc .extern func_01ffbe34 diff --git a/asm/ov15.s b/asm/ov15.s index ff1b29ad..8d1f2cb9 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -3657,7 +3657,7 @@ _02122794: bl Vec3p_Sub ldr r0, [sp, #0xa8] ldr r1, [sp, #0xb0] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 add r0, r0, #0x8000 @@ -4364,7 +4364,7 @@ _02123134: bge _02123298 ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -4506,7 +4506,7 @@ func_ov15_021232b4: ; 0x021232b4 bl Vec3p_Sub ldr r0, [sp, #0x1c] ldr r1, [sp, #0x24] - bl func_01ffa0f4 + bl Atan2 strh r0, [sp, #0x3c] ldr r0, _02123468 ; =gActorManager add r1, sp, #0x28 @@ -4744,11 +4744,11 @@ func_ov15_021236f8: ; 0x021236f8 beq _02123760 ldr r0, [r4, #0x60] ldr r1, [r4, #0x68] - bl func_01ffa0f4 + bl Atan2 mov r4, r0, lsl #0x10 mov r0, r5 mov r1, r6 - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 sub r0, r0, r4, asr #16 @@ -5834,7 +5834,7 @@ _02124590: strle r1, [r5, #0x4c] ldr r0, [r5, #0x60] ldr r1, [r5, #0x68] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -6763,7 +6763,7 @@ func_ov15_021252c0: ; 0x021252c0 mov r4, r0 ldr r0, [r4, #0x60] ldr r1, [r4, #0x68] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 sub r0, r0, #0x8000 @@ -6968,7 +6968,7 @@ func_ov15_02125474: ; 0x02125474 ldr r0, [sp] ldr r1, [sp, #8] str r2, [sp, #4] - bl func_01ffa0f4 + bl Atan2 strh r0, [r4, #0x78] add r0, r4, #0x200 mov r3, #0 @@ -7650,7 +7650,7 @@ _02125eb4: ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] movlt r4, #0x29 - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -7798,12 +7798,12 @@ func_ov15_021260a8: ; 0x021260a8 bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 b _02126108 _021260fc: ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 _02126108: add r1, r4, #0x200 strh r0, [r1, #0x98] @@ -16908,7 +16908,7 @@ func_ov15_0212d580: ; 0x0212d580 bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x100 strh r0, [r1, #0xd4] add r0, sp, #0 @@ -16966,7 +16966,7 @@ _0212d67c: ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] str r2, [sp, #0x1c] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 ldr r2, _0212d848 ; =0x00000222 @@ -17888,7 +17888,7 @@ func_ov15_0212e2c0: ; 0x0212e2c0 str r0, [sp, #0x74] ldr r0, [sp, #0x70] ldr r1, [sp, #0x78] - bl func_01ffa0f4 + bl Atan2 mov r5, r0, lsl #0x10 add r0, sp, #0x70 bl Vec3p_Length @@ -20100,7 +20100,7 @@ _02130220: bl Vec3p_Sub ldr r0, [sp, #0x24] ldr r1, [sp, #0x2c] - bl func_01ffa0f4 + bl Atan2 strh r0, [sp, #0x3c] ldr r1, [sp, #0x40] ldr r0, _02130544 ; =data_027e10a4 @@ -20681,7 +20681,7 @@ _02130aa8: bl Vec3p_Sub ldr r0, [sp, #0x28] ldr r1, [sp, #0x30] - bl func_01ffa0f4 + bl Atan2 strh r0, [r4, #0x78] mov r0, r4 mov r1, #1 @@ -23595,7 +23595,7 @@ _021333cc: ldrsh r5, [r1] ldr r0, [sp, #0x94] ldr r1, [sp, #0x9c] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 cmp r4, #0x1000 mov r6, r0, asr #0x10 @@ -23796,7 +23796,7 @@ _021336cc: _02133720: ldr r0, [sp, #0x5c] ldr r1, [sp, #0x64] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -25129,7 +25129,7 @@ _02134918: bne _02134948 ldr r0, [r4, #0x60] ldr r1, [r4, #0x68] - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x200 strh r0, [r1, #0x14] mov r0, #1 @@ -25308,7 +25308,7 @@ func_ov15_02134ae4: ; 0x02134ae4 mov r5, r0 ldr r0, [sp, #0x24] ldr r1, [sp, #0x2c] - bl func_01ffa0f4 + bl Atan2 add r1, r6, #0x200 mov r0, r0, lsl #0x10 ldrsh r1, [r1, #0x14] @@ -26365,7 +26365,7 @@ _02135988: bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 strh r0, [r4, #0x9a] mov r0, r4 bl func_ov15_021368c8 @@ -26772,7 +26772,7 @@ func_ov15_02135e2c: ; 0x02135e2c bl func_01ff8690 ldr r0, [r4] ldr r1, [r4, #8] - bl func_01ffa0f4 + bl Atan2 ldr r1, _021360c8 ; =gPlayerAngle ldr r3, [r5, #0x20] ldrsh ip, [r1] @@ -26998,7 +26998,7 @@ _0213618c: ldr r0, [r7] ldrsh r6, [r1] ldr r1, [r7, #8] - bl func_01ffa0f4 + bl Atan2 sub r0, r0, r6 mov r0, r0, lsl #0x10 cmp r4, #2 @@ -27835,7 +27835,7 @@ func_ov15_02136d04: ; 0x02136d04 bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 strh r0, [r4, #0x9a] mov r0, r4 bl func_ov15_021368c8 @@ -28472,7 +28472,7 @@ func_ov15_02137574: ; 0x02137574 strh r1, [r0, #0xdc] ldr r0, [sp, #0x1c] ldr r1, [sp, #0x24] - bl func_01ffa0f4 + bl Atan2 ldr r2, _021377bc ; =gPlayerAngle add r1, r6, #0x400 ldrsh r3, [r2] @@ -28511,7 +28511,7 @@ _021376a8: _021376b4: ldr r0, [sp, #0x1c] ldr r1, [sp, #0x24] - bl func_01ffa0f4 + bl Atan2 ldr r2, _021377bc ; =gPlayerAngle add r1, r6, #0x400 ldrsh r2, [r2] @@ -28552,7 +28552,7 @@ _0213773c: bl Vec3p_Length mov r1, r0 mov r0, r6 - bl func_01ffa0f4 + bl Atan2 rsb r0, r0, #0 mov r0, r0, lsl #0x10 ldr r2, _021377c8 ; =0x00001c72 @@ -30070,7 +30070,7 @@ _02138c30: bl Vec3p_Normalize ldr r0, [sp, #0x48] ldr r1, [sp, #0x50] - bl func_01ffa0f4 + bl Atan2 ldr r2, _02138fb4 ; =gPlayerAngle mov r1, r0, lsl #0x10 ldrsh r3, [r2] @@ -33345,7 +33345,7 @@ _0213ba10: bl Vec3p_Sub ldr r0, [sp, #4] ldr r1, [sp, #0xc] - bl func_01ffa0f4 + bl Atan2 ldr r1, _0213bbd8 ; =0x00000171 mov r0, r0, lsl #0x10 str r1, [r8, #0x280] @@ -33587,7 +33587,7 @@ _0213bd64: _0213bd9c: ldr r0, [sp, #0x10] ldr r1, [sp, #0x18] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 ldrsh r1, [r5, #0x78] mov r4, r0, asr #0x10 @@ -33798,7 +33798,7 @@ _0213c0a4: str r0, [r6, #0x288] ldr r0, [sp, #0x10] ldr r1, [sp, #0x18] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 ldrsh r2, [r6, #0x78] mov r5, r0, asr #0x10 @@ -33995,7 +33995,7 @@ func_ov15_0213c364: ; 0x0213c364 bl Vec3p_Sub ldr r0, [sp, #4] ldr r1, [sp, #0xc] - bl func_01ffa0f4 + bl Atan2 ldr r1, _0213c4e4 ; =0x00000171 mov r0, r0, lsl #0x10 str r1, [r7, #0x280] @@ -34421,7 +34421,7 @@ _0213c990: bl Vec3p_Add ldr r0, [sp, #4] ldr r1, [sp, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 ldrsh r1, [r4, #0x78] mov r5, r0, asr #0x10 @@ -36014,13 +36014,13 @@ func_ov15_0213ddb8: ; 0x0213ddb8 bne _0213de04 ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 strh r0, [r7, #0x78] b _0213de24 _0213de04: ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r2, r4 mov r1, r0, asr #0x10 @@ -36207,7 +36207,7 @@ _0213e048: ldr r0, [sp, #0x24] ldr r1, [sp, #0x2c] str r2, [sp, #0x28] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 ldrsh r2, [r5, #0x78] mov r7, r0, asr #0x10 @@ -38378,7 +38378,7 @@ _0213ffec: bl Vec3p_Sub ldr r0, [sp, #0x8c] ldr r1, [sp, #0x94] - bl func_01ffa0f4 + bl Atan2 mov r5, r0, lsl #0x10 mov r1, #0 add r0, sp, #0x8c @@ -43880,7 +43880,7 @@ _02144928: bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 add r0, sp, #0xc @@ -43894,7 +43894,7 @@ _02144928: bl Vec3p_Length mov r1, r0 ldr r0, [sp, #0x10] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 str r0, [r4, #0x460] @@ -44635,7 +44635,7 @@ _02145420: bl Vec3p_Sub ldr r0, [sp, #0x6c] ldr r1, [sp, #0x74] - bl func_01ffa0f4 + bl Atan2 add r1, r9, #0x300 ldrh r1, [r1, #0x84] ldr r5, [sp, #0x70] @@ -44648,7 +44648,7 @@ _02145420: bl Vec3p_Length mov r1, r0 mov r0, r5 - bl func_01ffa0f4 + bl Atan2 rsb r0, r0, #0 mov r2, #0x2000 mov r0, r0, lsl #0x10 @@ -47297,7 +47297,7 @@ _02147670: bl Vec3p_Sub ldr r0, [sp, #0x10] ldr r1, [sp, #0x18] - bl func_01ffa0f4 + bl Atan2 ldrb r1, [r4, #0x439] mov r0, r0, lsl #0x10 mov r6, r0, asr #0x10 @@ -47861,7 +47861,7 @@ _02147e9c: beq _02147f18 ldr r0, [sp, #0x10] ldr r1, [sp, #0x18] - bl func_01ffa0f4 + bl Atan2 add r1, r6, #0x400 strh r0, [r1, #0x36] _02147f18: @@ -48235,7 +48235,7 @@ _02148418: bl Vec3p_Sub ldr r0, [sp, #0x28] ldr r1, [sp, #0x30] - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x400 strh r0, [r1, #0x36] mov r0, #2 @@ -48265,7 +48265,7 @@ _02148484: _021484d0: ldr r0, [sp, #0x28] ldr r1, [sp, #0x30] - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x400 strh r0, [r1, #0x36] mov ip, #0x40 @@ -51714,10 +51714,10 @@ func_ov15_0214b408: ; 0x0214b408 str r1, [sp, #0x50] ldr r0, [r9, #0x10c] ldr r1, [r9, #0x108] - bl func_01ffa0f4 + bl Atan2 ldr r0, [r9, #0x104] ldr r1, [r9, #0x108] - bl func_01ffa0f4 + bl Atan2 mov r7, #0 mov r10, #0x180 ldr r4, _0214b5f8 ; =data_02050f54 @@ -51744,7 +51744,7 @@ _0214b4e0: bl Vec3p_Add ldr r0, [sp, #0x3c] ldr r1, [sp, #0x40] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, asr #0x4 mov r2, r0, lsl #0x1 mov r1, r2, lsl #0x1 @@ -55983,7 +55983,7 @@ _0214ebf4: bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 add r1, r8, #0x100 strh r0, [r1, #0xd4] add r0, sp, #0xc @@ -56047,7 +56047,7 @@ _0214ecf8: str r0, [r7, #4] ldr r0, [r7] ldr r1, [r7, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 mov r2, r5 @@ -56289,7 +56289,7 @@ _0214f010: bl Vec3p_Sub ldr r0, [sp, #0x30] ldr r1, [sp, #0x38] - bl func_01ffa0f4 + bl Atan2 add r1, r7, r4, lsl #1 add r1, r1, #0x100 strh r0, [r1, #0x64] @@ -56872,7 +56872,7 @@ _0214f834: str r0, [sp, #0x2c] ldr r0, [sp, #0x28] ldr r1, [sp, #0x30] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 add r0, r9, r8, lsl #1 add r0, r0, #0x100 @@ -58168,7 +58168,7 @@ _02150a6c: bl Vec3p_Sub ldr r0, [sp, #0x10] ldr r1, [sp, #0x18] - bl func_01ffa0f4 + bl Atan2 add r1, r5, #0x100 strh r0, [r1, #0xd4] ldrsh r0, [r1, #0xd4] @@ -60310,7 +60310,7 @@ func_ov15_02152694: ; 0x02152694 bl Vec3p_Sub ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 str r0, [r4, #0x464] @@ -60324,7 +60324,7 @@ func_ov15_02152694: ; 0x02152694 bl Vec3p_Length mov r1, r0 ldr r0, [sp, #0x1c] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 str r0, [r4, #0x460] @@ -61302,13 +61302,13 @@ _02153530: str r1, [sp, #0xc] ldr r1, [r5, #0x3cc] sub r0, r0, #0x2000 - bl func_01ffa0f4 + bl Atan2 add r0, r0, #0x4000 mov r2, r0, lsl #0x10 ldr r0, [r5, #0x3b4] ldr r1, [r5, #0x3bc] mov r6, r2, asr #0x10 - bl func_01ffa0f4 + bl Atan2 mov r1, #0x2800 mov r0, r0, lsl #0x10 rsb r1, r1, #0 @@ -62291,13 +62291,13 @@ _02154374: mov r0, #0x1000 ldr r1, [r5, #0x3cc] rsb r0, r0, #0 - bl func_01ffa0f4 + bl Atan2 add r1, r0, #0x4000 add r0, r5, #0x400 strh r1, [r0, #0x38] ldr r0, [r5, #0x3b4] ldr r1, [r5, #0x3bc] - bl func_01ffa0f4 + bl Atan2 add r1, r5, #0x400 strh r0, [r1, #0x3a] mov r2, #0 @@ -62668,7 +62668,7 @@ func_ov15_021548c4: ; 0x021548c4 mov r0, #0x1000 ldr r1, [r6, #0x3cc] rsb r0, r0, #0 - bl func_01ffa0f4 + bl Atan2 mov r1, #0x4000 rsb r1, r1, #0 sub r0, r1, r0 @@ -62677,7 +62677,7 @@ func_ov15_021548c4: ; 0x021548c4 ldr r1, [r6, #0x3bc] mov r4, r2, asr #0x10 ldr r5, [r6, #0x3cc] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r2, r0, asr #0x10 smull r0, r1, r2, r5 @@ -62715,7 +62715,7 @@ func_ov15_021548c4: ; 0x021548c4 bl Vec3p_Sub ldr r0, [sp, #0x48] ldr r1, [sp, #0x50] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 sub r0, r0, #0x4000 @@ -62918,10 +62918,10 @@ _02154c40: bl Vec3p_Sub ldr r0, [sp, #0x1c] ldr r1, [sp, #0x24] - bl func_01ffa0f4 + bl Atan2 ldr r0, [sp, #0x1c] ldr r1, [sp, #0x24] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 sub r0, r0, #0x4000 @@ -62980,7 +62980,7 @@ _02154d24: str r0, [sp, #0x28] str r2, [sp, #0x2c] str r1, [sp, #0x30] - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x400 mov r0, r0, lsl #0x10 ldrsh r9, [r1, #4] @@ -63063,7 +63063,7 @@ _02154e70: bl func_ov00_020d77e4 ldr r0, [r4, #0x3b4] ldr r1, [r4, #0x3bc] - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x400 strh r0, [r1] b _02154f9c @@ -63074,7 +63074,7 @@ _02154eb4: cmp r0, #0 ldr r0, [r4, #0x3b4] bge _02154efc - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 cmp r0, #0x1000 @@ -63087,7 +63087,7 @@ _02154eb4: bl func_ov00_020d77e4 b _02154f9c _02154efc: - bl func_01ffa0f4 + bl Atan2 mov r3, #0x1000 mov r0, r0, lsl #0x10 rsb r3, r3, #0 @@ -64540,13 +64540,13 @@ func_ov15_021562c4: ; 0x021562c4 sub r0, r1, r0 ldr r1, [r5, #0x50] sub r1, r2, r1 - bl func_01ffa0f4 + bl Atan2 strh r0, [sp, #0x38] ldr r2, [sp, #0x10] ldr r1, [r5, #0x4c] mov r0, r4 sub r1, r2, r1 - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 add r0, r0, #0x4000 @@ -64745,7 +64745,7 @@ func_ov15_0215658c: ; 0x0215658c ldr r2, [sp, #0x18] ldr r1, [r4, #0x4c] sub r1, r2, r1 - bl func_01ffa0f4 + bl Atan2 add r0, r0, #0x4000 strh r0, [sp, #6] ldr r1, [sp, #0x14] @@ -64754,7 +64754,7 @@ func_ov15_0215658c: ; 0x0215658c sub r0, r1, r0 ldr r1, [r4, #0x50] sub r1, r2, r1 - bl func_01ffa0f4 + bl Atan2 strh r0, [sp, #4] add r0, sp, #4 str r0, [sp] @@ -65212,7 +65212,7 @@ _02156be4: bl Vec3p_Sub ldr r0, [sp, #0x14] ldr r1, [sp, #0x1c] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 ldrsh r2, [r6, #0x78] mov r1, r0, asr #0x10 @@ -65630,7 +65630,7 @@ _021571ec: bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 strh r0, [r4, #0xee] b _0215716c _02157264: @@ -65726,7 +65726,7 @@ _02157330: bpl _02157330 ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] - bl func_01ffa0f4 + bl Atan2 add r1, r10, #0x200 strh r0, [r1, #0xee] b _0215744c @@ -65740,7 +65740,7 @@ _021573c0: beq _0215744c ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] - bl func_01ffa0f4 + bl Atan2 add r1, r10, #0x200 strh r0, [r1, #0xee] add r0, sp, #0x18 @@ -68413,7 +68413,7 @@ func_ov15_021597d0: ; 0x021597d0 bl Vec3p_Sub ldr r0, [sp, #4] ldr r1, [sp, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r5, r0, asr #0x10 mvn r0, #0x80000000 @@ -68662,7 +68662,7 @@ func_ov15_02159bec: ; 0x02159bec add r2, r6, #0x200 ldr r1, [r6, #0x68] ldrh r4, [r2, #0xea] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 ldr r2, _02159d70 ; =0x00000444 mov r1, r0, asr #0x10 @@ -69105,7 +69105,7 @@ func_ov15_0215a214: ; 0x0215a214 ldr r1, [r1, #0x14] ldr r0, [r1, #0x60] ldr r1, [r1, #0x68] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -71968,7 +71968,7 @@ _0215c95c: bge _0215ca60 ldr r0, [sp, #0x30] ldr r1, [sp, #0x38] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -72281,7 +72281,7 @@ _0215cda8: str r3, [sp, #0x1c] str r2, [sp, #0x20] ldr r4, [r4] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -74913,7 +74913,7 @@ _0215f158: ldr r1, [r1, #4] add r1, r1, #0x1800 sub r1, r1, r2 - bl func_01ffa0f4 + bl Atan2 rsb r1, r0, #0x4000 add r0, r9, #0x200 strh r1, [r0, #0x82] @@ -75004,7 +75004,7 @@ _0215f250: ldr r1, [r1, #4] add r1, r1, #0x1800 sub r1, r1, r2 - bl func_01ffa0f4 + bl Atan2 rsb r2, r0, #0x4000 add r0, r9, #0x200 mov r1, #0x10000 @@ -75521,7 +75521,7 @@ func_ov15_0215fa30: ; 0x0215fa30 bge _0215fa68 rsb r1, r2, #0 rsb r0, r0, #0 - bl func_01ffa0f4 + bl Atan2 add r0, r0, #0x4000 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 @@ -75530,7 +75530,7 @@ func_ov15_0215fa30: ; 0x0215fa30 _0215fa68: mov r1, r2 rsb r0, r0, #0 - bl func_01ffa0f4 + bl Atan2 add r1, r0, #0x4000 mvn r0, #0 mul r0, r1, r0 @@ -75569,12 +75569,12 @@ func_ov15_0215fa90: ; 0x0215fa90 bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 b _0215fb0c _0215fb00: ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 _0215fb0c: add r1, r5, #0x300 strh r0, [r1, #0xd8] @@ -76839,7 +76839,7 @@ _02160b18: bl Vec3p_Sub ldr r0, [sp, #0x50] ldr r1, [sp, #0x58] - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x100 strh r0, [r1, #0xd4] ldrsh r2, [r1, #0xd4] @@ -78611,7 +78611,7 @@ _021623c4: bl Vec3p_Sub ldr r0, [sp, #0x20] ldr r1, [sp, #0x28] - bl func_01ffa0f4 + bl Atan2 add r1, r10, #0x100 strh r0, [r1, #0xd4] ldrsh r1, [r1, #0xd4] @@ -79583,7 +79583,7 @@ _02163224: _02163238: ldr r0, [sp, #0xd0] ldr r1, [sp, #0xd8] - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x100 strh r0, [r1, #0xd4] ldrsh r1, [r1, #0xd4] @@ -85521,7 +85521,7 @@ _021683d4: ldr r2, [r4, #0x4c] ldr r0, [sp, #0x60] sub r0, r2, r0 - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x300 strh r0, [r1, #0x10] b _021685dc @@ -85868,7 +85868,7 @@ _021688e8: sub r2, r2, r1 mov r1, #0x12800 str r2, [sp, #8] - bl func_01ffa0f4 + bl Atan2 strh r0, [sp, #4] ldrb r0, [r5, #0x312] cmp r0, #0 @@ -85896,7 +85896,7 @@ _0216894c: b _02168a44 _0216898c: mov r0, #0x12800 - bl func_01ffa0f4 + bl Atan2 ldrb r1, [r5, #0x312] mov r0, r0, lsl #0x10 mov r3, r0, asr #0x10 @@ -86326,12 +86326,12 @@ func_ov15_02168efc: ; 0x02168efc bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 b _02168f74 _02168f68: ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 _02168f74: add r1, r4, #0x300 strh r0, [r1, #0xe] @@ -87119,7 +87119,7 @@ func_ov15_02169938: ; 0x02169938 ldr r1, [r4, #0x50] sub r0, r3, r0 sub r1, r2, r1 - bl func_01ffa0f4 + bl Atan2 ldr r2, [r5, #0x14] mov r0, r0, asr #0xc add r0, r0, #8 @@ -96777,7 +96777,7 @@ _02171e28: bl Vec3p_Sub ldr r0, [sp, #4] ldr r1, [sp, #0xc] - bl func_01ffa0f4 + bl Atan2 ldr r1, [r4, #0x130] mov r0, r0, lsl #0x10 cmp r1, #3 @@ -96949,7 +96949,7 @@ func_ov15_02172070: ; 0x02172070 beq _021720e4 ldr r0, [sp, #4] rsb r0, r0, #0 - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x500 ldrsh r2, [r1, #0x58] mov r0, r0, lsl #0x10 @@ -97206,7 +97206,7 @@ func_ov15_02172260: ; 0x02172260 mov r5, r0 ldr r0, [sp, #0x10] ldr r1, [sp, #0x18] - bl func_01ffa0f4 + bl Atan2 ldrsh r2, [r4, #0x78] mov r0, r0, lsl #0x10 ldr r1, _021724c8 ; =data_02050f54 @@ -98284,7 +98284,7 @@ _02173264: ldr r2, [r6, #0x520] ldr r0, [sp, #0x30] sub r0, r2, r0 - bl func_01ffa0f4 + bl Atan2 str r0, [sp, #0x54] _02173350: ldr r2, [sp, #0x38] @@ -98528,7 +98528,7 @@ _021736a4: ldr r0, [r5, #4] mov r1, #0x1000 sub r0, r2, r0 - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 str r0, [r4, #0x10] @@ -99125,7 +99125,7 @@ func_ov15_02173cb4: ; 0x02173cb4 str r0, [sp, #0x2c] ldr r0, [sp, #0x28] ldr r1, [sp, #0x30] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r6, r0, asr #0x10 add r0, sp, #0x28 @@ -108349,7 +108349,7 @@ _0217bdec: str r0, [r4, #0x68] ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] - bl func_01ffa0f4 + bl Atan2 strh r0, [r4, #0x78] _0217be14: add sp, sp, #0x68 @@ -114332,7 +114332,7 @@ _02180e68: ldr r0, [sp, #0x4c] ldr r1, [sp, #0x54] ldrsh r6, [r2] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 cmp r5, #0x3000 mov r7, r0, asr #0x10 @@ -116077,7 +116077,7 @@ _021827a8: ldr r0, [r5, #4] ldr r1, _0218280c ; =0x00001333 sub r0, r2, r0 - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 str r0, [r4, #0x10] @@ -116837,7 +116837,7 @@ _021830c0: strh r2, [sp, #8] ldr r2, [r6, #0x328] sub r0, r2, r0 - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 add r0, sp, #8 mov r1, r1, asr #0x10 diff --git a/asm/ov17.inc b/asm/ov17.inc index 3fea6450..8cc49ad2 100644 --- a/asm/ov17.inc +++ b/asm/ov17.inc @@ -141,7 +141,7 @@ .extern Vec3p_Sub .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa9fc .extern func_01ffbe34 .extern func_01ffbf5c diff --git a/asm/ov17.s b/asm/ov17.s index 3a938a25..15e1499a 100644 --- a/asm/ov17.s +++ b/asm/ov17.s @@ -8846,7 +8846,7 @@ func_ov17_021623e8: ; 0x021623e8 str r0, [sp] str r2, [sp, #4] str r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 ldrsh r1, [r4, #0x60] mov r0, r0, lsl #0x10 cmp r1, #0 diff --git a/asm/ov18.inc b/asm/ov18.inc index 2f917e37..1d4405f5 100644 --- a/asm/ov18.inc +++ b/asm/ov18.inc @@ -140,7 +140,7 @@ .extern Vec3p_Sub .extern Vec3p_Length .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa8d4 .extern func_01ffa9fc .extern func_01ffbe34 diff --git a/asm/ov18.s b/asm/ov18.s index 2aae23cd..988680e0 100644 --- a/asm/ov18.s +++ b/asm/ov18.s @@ -13853,7 +13853,7 @@ func_ov18_02166700: ; 0x02166700 bl Vec3p_Sub ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 str r0, [r5, #0x48c] @@ -13867,7 +13867,7 @@ func_ov18_02166700: ; 0x02166700 bl Vec3p_Length mov r1, r0 ldr r0, [sp, #0x1c] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 cmp r4, #0 @@ -14517,7 +14517,7 @@ func_ov18_02166f20: ; 0x02166f20 sub r0, r1, r0 ldr r1, [r4, #0x50] sub r1, r2, r1 - bl func_01ffa0f4 + bl Atan2 strh r0, [r4, #0x78] add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} diff --git a/asm/ov19.inc b/asm/ov19.inc index 8a0523f0..8f9f08a9 100644 --- a/asm/ov19.inc +++ b/asm/ov19.inc @@ -151,7 +151,7 @@ .extern Vec3p_Sub .extern Vec3p_Normalize .extern Vec3p_Axpy -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa9fc .extern func_01fffbec .extern func_01fffcd8 diff --git a/asm/ov19.s b/asm/ov19.s index 7b5110c2..c0708f05 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -641,7 +641,7 @@ func_ov19_0216df14: ; 0x0216df14 bl Vec3p_Sub ldr r0, [r4, #0x60] ldr r1, [r4, #0x68] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -1137,7 +1137,7 @@ _0216e46c: str r0, [sp, #0x3c] ldr r0, [sp, #0x38] ldr r1, [sp, #0x40] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -1608,7 +1608,7 @@ _0216eb88: bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -5143,7 +5143,7 @@ _021719a4: _02171a04: ldr r0, [r5, #0x60] ldr r1, [r5, #0x68] - bl func_01ffa0f4 + bl Atan2 add r1, r5, #0x200 strh r0, [r1, #0xec] _02171a18: diff --git a/asm/ov20.inc b/asm/ov20.inc index 8f6bc943..2baa8a9e 100644 --- a/asm/ov20.inc +++ b/asm/ov20.inc @@ -140,7 +140,7 @@ .extern Vec3p_Normalize .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffbe78 .extern func_01fffbec .extern func_01fffcec diff --git a/asm/ov20.s b/asm/ov20.s index 73a96da2..46e384b1 100644 --- a/asm/ov20.s +++ b/asm/ov20.s @@ -762,7 +762,7 @@ _0216e120: bl Vec3p_Sub ldr r0, [sp, #0x5c] ldr r1, [sp, #0x64] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 str r0, [sp, #0x10] ldr r0, _0216e548 ; =data_027e0764 @@ -2390,7 +2390,7 @@ func_ov20_0216f82c: ; 0x0216f82c bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r2, r0, asr #0x10 mov r1, #0 @@ -3612,7 +3612,7 @@ func_ov20_02170740: ; 0x02170740 bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 diff --git a/asm/ov21.inc b/asm/ov21.inc index 20022bdd..3f64c21f 100644 --- a/asm/ov21.inc +++ b/asm/ov21.inc @@ -98,7 +98,7 @@ .extern Vec3p_Add .extern Vec3p_Sub .extern Vec3p_Dot -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffbe78 .extern func_01ffbf5c .extern func_01fffd04 diff --git a/asm/ov21.s b/asm/ov21.s index 39c4305b..793ac6c2 100644 --- a/asm/ov21.s +++ b/asm/ov21.s @@ -3143,7 +3143,7 @@ _0216fddc: str r0, [sp, #0x2c] str r2, [sp, #0x30] str r1, [sp, #0x34] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl func_0202bc10 diff --git a/asm/ov22.inc b/asm/ov22.inc index 12f03bd5..c4028ab0 100644 --- a/asm/ov22.inc +++ b/asm/ov22.inc @@ -148,7 +148,7 @@ .extern Vec3p_Normalize .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffbe78 .extern func_01fffb4c .extern func_01fffbec diff --git a/asm/ov22.s b/asm/ov22.s index 896f6cb1..c94e15df 100644 --- a/asm/ov22.s +++ b/asm/ov22.s @@ -5172,7 +5172,7 @@ func_ov22_02171aa0: ; 0x02171aa0 _02171adc: ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 ldrsh r2, [r5, #0x78] mov r0, r0, lsl #0x10 ldr r1, _02171dbc ; =0xffff8001 @@ -8190,7 +8190,7 @@ _02174294: beq _021742f4 ldr r0, [r5, #0xc4] ldr r1, [r5, #0xcc] - bl func_01ffa0f4 + bl Atan2 ldrsh r1, [r5, #0x78] mov r0, r0, lsl #0x10 rsb r0, r1, r0, asr #16 @@ -8536,7 +8536,7 @@ func_ov22_0217474c: ; 0x0217474c ldr r0, [r1] ldr r1, [r1, #8] mov r4, r2 - bl func_01ffa0f4 + bl Atan2 strh r0, [sp] add r1, sp, #0 mov r0, r5 diff --git a/asm/ov23.inc b/asm/ov23.inc index 083dcfda..7437efb5 100644 --- a/asm/ov23.inc +++ b/asm/ov23.inc @@ -194,7 +194,7 @@ .extern Vec3p_Normalize .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffbe34 .extern func_01ffbe78 .extern func_01ffec34 diff --git a/asm/ov23.s b/asm/ov23.s index 8fec3194..7411a1b5 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -4869,7 +4869,7 @@ _02171510: str r1, [r0, #4] ldr r0, [r5] ldr r1, [r5, #8] - bl func_01ffa0f4 + bl Atan2 mov r4, r0 mov r0, r7 bl _ZN13LinkStateBase14GetPlayerAngleEv @@ -4936,7 +4936,7 @@ _02171614: str r1, [r0, #4] ldr r0, [r5] ldr r1, [r5, #8] - bl func_01ffa0f4 + bl Atan2 mov r4, r0 mov r0, r7 bl _ZN13LinkStateBase14GetPlayerAngleEv @@ -5036,7 +5036,7 @@ _02171788: str r1, [r0, #4] ldr r0, [r4] ldr r1, [r4, #8] - bl func_01ffa0f4 + bl Atan2 mov r4, r0 mov r0, r5 bl _ZN13LinkStateBase14GetPlayerAngleEv @@ -5194,7 +5194,7 @@ _021719b0: ldr r0, [sp, #0x1c] ldr r1, [sp, #0x24] mov r5, #0x1000 - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r6, r0, asr #0x10 b _02171a38 @@ -5483,7 +5483,7 @@ _02171e18: mov r1, r0 ldr r0, [r1] ldr r1, [r1, #8] - bl func_01ffa0f4 + bl Atan2 ldr r2, _02172084 ; =data_ov23_0217a2c4 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 @@ -7266,7 +7266,7 @@ _0217356c: _021735ac: ldr r0, [r5, #4] ldr r1, [r5, #0xc] - bl func_01ffa0f4 + bl Atan2 ldrsh r2, [r4, #0x78] mov r0, r0, lsl #0x10 ldr r1, _021738a0 ; =0xffff8001 @@ -9595,7 +9595,7 @@ _021754bc: ldr r1, [r1, #0x50] sub r0, r3, r0 sub r1, r2, r1 - bl func_01ffa0f4 + bl Atan2 ldrsh r1, [r6, #0x78] mov r0, r0, lsl #0x10 rsb r0, r1, r0, asr #16 @@ -13362,7 +13362,7 @@ func_ov23_02178630: ; 0x02178630 ldr r1, _02178718 ; =gPlayerVel ldr r0, [r1] ldr r1, [r1, #8] - bl func_01ffa0f4 + bl Atan2 ldr r1, _0217871c ; =gPlayerAngle strh r0, [r1] _0217867c: @@ -13401,7 +13401,7 @@ _021786f8: ldr r1, _02178718 ; =gPlayerVel ldr r0, [r1] ldr r1, [r1, #8] - bl func_01ffa0f4 + bl Atan2 ldr r1, _0217871c ; =gPlayerAngle strh r0, [r1] ldmia sp!, {r4, pc} @@ -14025,7 +14025,7 @@ _02178fd8: mov r1, r0 ldr r0, [r1] ldr r1, [r1, #8] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r10 mov r4, r1, asr #0x10 diff --git a/asm/ov24.inc b/asm/ov24.inc index 572b54d3..daa2431d 100644 --- a/asm/ov24.inc +++ b/asm/ov24.inc @@ -138,7 +138,7 @@ .extern Vec3p_Dot .extern Vec3p_Length .extern Vec3p_Axpy -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffb7ec .extern func_01ffbf5c .extern func_01ffec34 diff --git a/asm/ov24.s b/asm/ov24.s index cb21d94a..e65eeaf9 100644 --- a/asm/ov24.s +++ b/asm/ov24.s @@ -3309,7 +3309,7 @@ _0217012c: _0217013c: ldr r0, [r2] ldr r1, [r2, #8] - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x300 strh r0, [r1, #0x52] add r0, r4, #0x318 @@ -3453,7 +3453,7 @@ _021702f0: ldr r1, [r5, #0x50] sub r1, r2, r1 str r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 ldr r0, [r4, #0x14] mov r1, r1, asr #0x10 @@ -5742,7 +5742,7 @@ _02172078: ldmeqia sp!, {r3, r4, r5, pc} ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r5 mov r1, r1, asr #0x10 @@ -5779,7 +5779,7 @@ _021720f4: beq _021721e0 ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r5 mov r1, r1, asr #0x10 @@ -5801,7 +5801,7 @@ _02172148: beq _021721e0 ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r5 mov r1, r1, asr #0x10 @@ -5819,7 +5819,7 @@ _0217219c: beq _021721e0 ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r5 mov r1, r1, asr #0x10 @@ -7266,7 +7266,7 @@ _02173524: ldmeqia sp!, {r3, r4, r5, pc} ldr r0, [r5, #4] ldr r1, [r5, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r4 mov r1, r1, asr #0x10 @@ -7295,7 +7295,7 @@ _02173594: beq _02173660 ldr r0, [r5, #4] ldr r1, [r5, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r4 mov r1, r1, asr #0x10 @@ -7313,7 +7313,7 @@ _021735d8: beq _02173660 ldr r0, [r5, #4] ldr r1, [r5, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r4 mov r1, r1, asr #0x10 @@ -7331,7 +7331,7 @@ _0217361c: beq _02173660 ldr r0, [r5, #4] ldr r1, [r5, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r4 mov r1, r1, asr #0x10 @@ -7715,7 +7715,7 @@ func_ov24_02173b18: ; 0x02173b18 bl Vec3p_Sub ldr r0, [sp, #0x24] ldr r1, [sp, #0x2c] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 ldrsh r2, [r4, #0x78] mov r3, r0, asr #0x10 @@ -9114,7 +9114,7 @@ _02174d24: ; jump table _02174d44: ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 ldrsh r2, [r5, #0x78] mov r0, r0, lsl #0x10 ldr r1, _02175204 ; =0xffff8001 @@ -9142,7 +9142,7 @@ _02174d84: beq _021751fc ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r5 mov r1, r1, asr #0x10 @@ -9180,7 +9180,7 @@ _02174e00: _02174e38: ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 ldrsh r2, [r5, #0x78] mov r0, r0, lsl #0x10 ldr r1, _02175204 ; =0xffff8001 @@ -9208,7 +9208,7 @@ _02174e78: beq _021751fc ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r5 mov r1, r1, asr #0x10 @@ -9237,7 +9237,7 @@ _02174ed4: _02174f10: ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 ldrsh r2, [r5, #0x78] mov r0, r0, lsl #0x10 ldr r1, _02175204 ; =0xffff8001 @@ -9265,7 +9265,7 @@ _02174f50: beq _021751fc ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r5 mov r1, r1, asr #0x10 @@ -9301,7 +9301,7 @@ _02174ff0: beq _021751fc ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r5 mov r1, r1, asr #0x10 @@ -9346,7 +9346,7 @@ _02175094: ldmeqia sp!, {r3, r4, r5, pc} ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r5 mov r1, r1, asr #0x10 @@ -9383,7 +9383,7 @@ _02175110: beq _021751fc ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r5 mov r1, r1, asr #0x10 @@ -9405,7 +9405,7 @@ _02175164: beq _021751fc ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r5 mov r1, r1, asr #0x10 @@ -9423,7 +9423,7 @@ _021751b8: beq _021751fc ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r5 mov r1, r1, asr #0x10 diff --git a/asm/ov25.inc b/asm/ov25.inc index 359505bb..b0cff43d 100644 --- a/asm/ov25.inc +++ b/asm/ov25.inc @@ -147,7 +147,7 @@ .extern Vec3p_Normalize .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffe1cc .extern func_01fffcd8 .extern func_01fffcec diff --git a/asm/ov25.s b/asm/ov25.s index 6208a813..30aac2fa 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -723,7 +723,7 @@ func_ov25_0216e024: ; 0x0216e024 bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 ldr r2, _0216e088 ; =0x0000071c @@ -831,7 +831,7 @@ func_ov25_0216e174: ; 0x0216e174 bl Vec3p_Sub ldr r0, [r4, #0x60] ldr r1, [r4, #0x68] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -3252,7 +3252,7 @@ _02170278: bl Vec3p_Sub ldr r0, [sp, #0x1c] ldr r1, [sp, #0x24] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 ldr r1, _021703b4 ; =0x00000e39 mov r2, r0, asr #0x10 @@ -5630,7 +5630,7 @@ _0217229c: beq _02172370 ldr r0, [r5, #0xc4] ldr r1, [r5, #0xcc] - bl func_01ffa0f4 + bl Atan2 add r1, r5, #0x100 strh r0, [r1, #0x70] ldr r0, _021724e0 ; =data_027e0ffc @@ -12488,7 +12488,7 @@ func_ov25_02177dc4: ; 0x02177dc4 str r0, [r4, #0x64] ldr r0, [r4, #0x60] ldr r1, [r4, #0x68] - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x100 strh r0, [r1, #0x5c] ldrh r1, [r1, #0x5c] diff --git a/asm/ov27.inc b/asm/ov27.inc index 427c103d..a0fe6bf1 100644 --- a/asm/ov27.inc +++ b/asm/ov27.inc @@ -133,7 +133,7 @@ .extern Vec3p_Normalize .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffbe34 .extern func_01ffbe78 .extern func_01fffb4c diff --git a/asm/ov27.s b/asm/ov27.s index 494fabbb..17ab3922 100644 --- a/asm/ov27.s +++ b/asm/ov27.s @@ -893,7 +893,7 @@ _0216e2b8: bl Vec3p_Sub ldr r0, [sp, #0x44] ldr r1, [sp, #0x4c] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 ldr r1, [sp, #0x18c] @@ -1030,7 +1030,7 @@ _0216e4f4: bl Vec3p_Sub ldr r0, [sp, #0x38] ldr r1, [sp, #0x40] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 ldr r1, [sp, #0x74] @@ -1476,7 +1476,7 @@ _0216eb54: bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r2, #0xfa0 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 @@ -1700,7 +1700,7 @@ _0216eee8: bl Vec3p_Sub ldr r0, [sp, #0x3c] ldr r1, [sp, #0x44] - bl func_01ffa0f4 + bl Atan2 ldr r1, [r6, #0x130] mov r0, r0, lsl #0x10 cmp r1, #0xa @@ -1960,7 +1960,7 @@ _0216f2a0: bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 mov r4, r0 ldr r0, _0216f32c ; =data_027e0ffc add r2, r6, #0x48 @@ -4111,7 +4111,7 @@ _02171074: _02171094: ldr r0, [sp, #0x2c] ldr r1, [sp, #0x34] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 cmp r9, #0 @@ -4766,7 +4766,7 @@ _021718e0: bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r2, #0xfa0 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 @@ -5357,7 +5357,7 @@ _02172154: str r0, [sp, #0x50] str r2, [sp, #0x54] str r1, [sp, #0x58] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 ldrsh r0, [r6, #0x78] mov r2, r1, asr #0x10 @@ -9399,7 +9399,7 @@ func_ov27_02175660: ; 0x02175660 bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 ldr r2, _02175814 ; =0x0000038e @@ -10921,7 +10921,7 @@ _02176ba4: _02176ba8: ldr r0, [sp, #0x2c] ldr r1, [sp, #0x34] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 cmp r9, #0 @@ -11752,7 +11752,7 @@ _0217772c: bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 ldr r1, [r6, #0x10] mov r0, r0, lsl #0x10 cmp r1, #7 diff --git a/asm/ov28.inc b/asm/ov28.inc index 800133fa..cba911db 100644 --- a/asm/ov28.inc +++ b/asm/ov28.inc @@ -142,7 +142,7 @@ .extern Vec3p_Normalize .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01fffbec .extern func_01fffd04 .extern func_020078f4 diff --git a/asm/ov28.s b/asm/ov28.s index 6298e4e3..b218d52c 100644 --- a/asm/ov28.s +++ b/asm/ov28.s @@ -4067,7 +4067,7 @@ func_ov28_02170b54: ; 0x02170b54 bl Vec3p_Sub ldr r0, [sp, #0x14] ldr r1, [sp, #0x1c] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 str r0, [r4, #0x4a4] @@ -4081,7 +4081,7 @@ func_ov28_02170b54: ; 0x02170b54 bl Vec3p_Length mov r1, r0 ldr r0, [sp, #0x18] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 str r0, [r4, #0x4a0] @@ -4403,7 +4403,7 @@ func_ov28_02170fa0: ; 0x02170fa0 bl _ZN5Actor9GetHitboxEP8Cylinder ldr r0, [r4] ldr r1, [r4, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -12524,7 +12524,7 @@ _0217783c: add r1, r1, r0 mov r0, r4 sub r1, r2, r1 - bl func_01ffa0f4 + bl Atan2 rsb r0, r0, #0x4000 mov r0, r0, lsl #0x10 ldr r2, _021778b8 ; =0x00001555 @@ -13029,7 +13029,7 @@ _02177ed8: beq _02177f5c ldr r0, [r4, #0xc4] ldr r1, [r4, #0xcc] - bl func_01ffa0f4 + bl Atan2 ldr r3, _0217804c ; =data_027e0764 ldr r1, _02178050 ; =0x00004001 ldr r5, [r3] diff --git a/asm/ov29.inc b/asm/ov29.inc index cde3bcb6..e6c53607 100644 --- a/asm/ov29.inc +++ b/asm/ov29.inc @@ -129,7 +129,7 @@ .extern Vec3p_Normalize .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01fffb4c .extern func_01fffbec .extern func_01fffcec diff --git a/asm/ov29.s b/asm/ov29.s index 918e9e26..cda4f0cb 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -6299,7 +6299,7 @@ _02172ad8: bl _ZN5Actor9GetHitboxEP8Cylinder ldr r0, [r5, #4] ldr r1, [r5, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -9417,7 +9417,7 @@ func_ov29_021755b4: ; 0x021755b4 bl func_01ff9958 mov r1, r0 mov r0, r6 - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 add r0, r5, #0x2bc diff --git a/asm/ov30.inc b/asm/ov30.inc index 403319b1..799babff 100644 --- a/asm/ov30.inc +++ b/asm/ov30.inc @@ -109,7 +109,7 @@ .extern Vec3p_Sub .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffbe34 .extern func_01ffbf5c .extern func_01ffe1cc diff --git a/asm/ov30.s b/asm/ov30.s index 97f20741..7039d00d 100644 --- a/asm/ov30.s +++ b/asm/ov30.s @@ -1596,7 +1596,7 @@ func_ov30_0217d09c: ; 0x0217d09c ldrsh r8, [r0, #0x40] ldr r0, [sp, #0x4c] ldr r1, [sp, #0x54] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 rsb r0, r8, r0, asr #16 mov r0, r0, lsl #0x10 @@ -1626,7 +1626,7 @@ _0217d1b0: ldrsh r5, [r0, #0x40] ldr r0, [sp, #0x4c] ldr r1, [sp, #0x54] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 rsb r0, r5, r0, asr #16 mov r0, r0, lsl #0x10 @@ -1654,7 +1654,7 @@ _0217d220: ldrsh r5, [r0, #0x40] ldr r0, [sp, #0x4c] ldr r1, [sp, #0x54] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 rsb r0, r5, r0, asr #16 mov r0, r0, lsl #0x10 @@ -1892,7 +1892,7 @@ func_ov30_0217d4e8: ; 0x0217d4e8 ldrsh r6, [r0, #0x40] ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 rsb r0, r6, r0, asr #16 mov r0, r0, lsl #0x10 @@ -1920,7 +1920,7 @@ _0217d5e0: ldrsh r6, [r0, #0x40] ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 rsb r0, r6, r0, asr #16 mov r0, r0, lsl #0x10 @@ -6894,7 +6894,7 @@ func_ov30_021812f0: ; 0x021812f0 mov r4, r0 ldr r0, [r1] ldr r1, [r1, #8] - bl func_01ffa0f4 + bl Atan2 ldrsh r2, [r4, #0x78] mov r0, r0, lsl #0x10 ldr r1, _02181360 ; =0xffff8001 @@ -8108,7 +8108,7 @@ func_ov30_0218237c: ; 0x0218237c bl func_ov30_0217c588 ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x800 strh r0, [r1, #0x40] add sp, sp, #0xc @@ -8796,7 +8796,7 @@ func_ov30_02182cb4: ; 0x02182cb4 beq _02182d34 ldr r0, [r4, #0xc4] ldr r1, [r4, #0xcc] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 sub r0, r0, #0x8000 @@ -14014,11 +14014,11 @@ _02186ed8: bl Vec3p_Sub ldr r0, [sp, #0x1c] ldr r1, [sp, #0x24] - bl func_01ffa0f4 + bl Atan2 mov r5, r0, lsl #0x10 ldr r0, [sp, #0x10] ldr r1, [sp, #0x18] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 rsb r0, r0, r5, asr #16 diff --git a/asm/ov32.inc b/asm/ov32.inc index eaac9c70..8badba4f 100644 --- a/asm/ov32.inc +++ b/asm/ov32.inc @@ -122,7 +122,7 @@ .extern Vec3p_Length .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa9fc .extern func_01ffbf5c .extern func_01fffcd8 diff --git a/asm/ov32.s b/asm/ov32.s index e6840118..e658c08a 100644 --- a/asm/ov32.s +++ b/asm/ov32.s @@ -7918,7 +7918,7 @@ func_ov32_02182490: ; 0x02182490 str r0, [sp] str r2, [sp, #4] str r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 ldrsh r1, [r4, #0xc] mov r0, r0, lsl #0x10 rsbs r1, r1, r0, asr #16 diff --git a/asm/ov33.inc b/asm/ov33.inc index 96dd8881..1577b0a1 100644 --- a/asm/ov33.inc +++ b/asm/ov33.inc @@ -91,7 +91,7 @@ .extern Vec3p_Sub .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffe1cc .extern func_01fffcec .extern func_02016fcc diff --git a/asm/ov33.s b/asm/ov33.s index 3de4821f..a4643ac3 100644 --- a/asm/ov33.s +++ b/asm/ov33.s @@ -3926,7 +3926,7 @@ _0217f040: beq _0217f06c ldr r0, [r4, #0x60] ldr r1, [r4, #0x68] - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x300 strh r0, [r1, #0xdc] b _0217f1b8 diff --git a/asm/ov34.inc b/asm/ov34.inc index a902b49c..be908e96 100644 --- a/asm/ov34.inc +++ b/asm/ov34.inc @@ -95,7 +95,7 @@ .extern Vec3p_Sub .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa9fc .extern func_01fffcec .extern func_01fffd04 diff --git a/asm/ov34.s b/asm/ov34.s index 04ab36df..daa33249 100644 --- a/asm/ov34.s +++ b/asm/ov34.s @@ -3240,7 +3240,7 @@ func_ov34_0217ea88: ; 0x0217ea88 bl Vec3p_Sub ldr r0, [sp, #4] ldr r1, [sp, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 add r0, r4, #0x1d80 @@ -3324,7 +3324,7 @@ func_ov34_0217eb94: ; 0x0217eb94 bl Vec3p_Sub ldr r0, [sp, #0x3c] ldr r1, [sp, #0x44] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 add r0, r4, #0x1d80 @@ -3604,7 +3604,7 @@ func_ov34_0217ef88: ; 0x0217ef88 _0217eff8: ldr r1, [sp, #0x18] str r0, [sp, #0x10] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 add r0, r4, #0x1d80 @@ -3735,7 +3735,7 @@ func_ov34_0217f120: ; 0x0217f120 _0217f1d0: ldr r1, [sp, #0x24] str r0, [sp, #0x1c] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 add r0, r4, #0x1d80 @@ -4034,7 +4034,7 @@ _0217f604: bl Vec3p_Sub ldr r0, [sp, #0x10] ldr r1, [sp, #0x18] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 add r0, r4, #0x1d80 @@ -4185,7 +4185,7 @@ func_ov34_0217f7c8: ; 0x0217f7c8 bl Vec3p_Sub ldr r0, [sp, #0x74] ldr r1, [sp, #0x7c] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 add r0, r5, #0x1d80 @@ -4876,7 +4876,7 @@ _02180200: _02180258: ldr r1, [sp, #0x18] str r0, [sp, #0x10] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 add r0, r4, #0x1d80 @@ -5027,7 +5027,7 @@ func_ov34_021803c0: ; 0x021803c0 _02180468: ldr r1, [sp, #0x4c] str r0, [sp, #0x44] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 add r0, r5, #0x1d80 @@ -5305,7 +5305,7 @@ func_ov34_02180854: ; 0x02180854 ldr r0, [sp, #0x10] ldr r1, [sp, #0x14] rsb r0, r0, #0 - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 ldr r1, _02180994 ; =0x000031c7 mov r4, r0, asr #0x10 @@ -5318,7 +5318,7 @@ func_ov34_02180854: ; 0x02180854 _021808a8: ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 ldr r1, _02180994 ; =0x000031c7 mov r6, r0, asr #0x10 @@ -6574,7 +6574,7 @@ func_ov34_02181a00: ; 0x02181a00 bl Vec3p_Sub ldr r0, [sp, #0x38] ldr r1, [sp, #0x40] - bl func_01ffa0f4 + bl Atan2 add r1, r6, #0x1d00 ldrsh r2, [r1, #0x86] mov r0, r0, lsl #0x10 @@ -9950,7 +9950,7 @@ func_ov34_02184950: ; 0x02184950 bl func_ov00_020b18d8 ldr r0, [r4, #0x60] ldr r1, [r4, #0x68] - bl func_01ffa0f4 + bl Atan2 add sp, sp, #0x34 strh r0, [r4, #0x78] ldmia sp!, {r3, r4, pc} diff --git a/asm/ov35.inc b/asm/ov35.inc index 5e303a2c..0c1d6d27 100644 --- a/asm/ov35.inc +++ b/asm/ov35.inc @@ -124,7 +124,7 @@ .extern Vec3p_Length .extern Vec3p_Normalize .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa9fc .extern func_01ffbe78 .extern func_01fffbec diff --git a/asm/ov35.s b/asm/ov35.s index bd427b05..06c6d9b8 100644 --- a/asm/ov35.s +++ b/asm/ov35.s @@ -824,7 +824,7 @@ _0217c898: ldr r1, [r7, #0x50] sub r1, r2, r1 str r1, [sp, #0xc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 ldr r0, [r6, #0x14] mov r1, r1, asr #0x10 @@ -1148,7 +1148,7 @@ func_ov35_0217cce8: ; 0x0217cce8 str r0, [sp] sub r1, r2, r1 str r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 cmp r5, #0 @@ -2535,7 +2535,7 @@ _0217df84: bl Vec3p_Sub ldr r0, [sp, #4] ldr r1, [sp, #0xc] - bl func_01ffa0f4 + bl Atan2 ldr r3, _0217e2d0 ; =data_027e0764 ldr r1, _0217e2dc ; =0x00000e39 ldr r4, [r3] @@ -4319,7 +4319,7 @@ _0217f83c: beq _0217f888 ldr r0, [r4, #0xc4] ldr r1, [r4, #0xcc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r4 mov r1, r1, asr #0x10 @@ -6143,7 +6143,7 @@ _021812d0: beq _02181314 ldr r0, [r5, #0xc4] ldr r1, [r5, #0xcc] - bl func_01ffa0f4 + bl Atan2 ldrsh r1, [r5, #0x78] mov r0, r0, lsl #0x10 rsb r0, r1, r0, asr #16 @@ -6432,7 +6432,7 @@ _021816cc: blt _02181700 ldr r0, [sp, #4] ldr r1, [sp, #0xc] - bl func_01ffa0f4 + bl Atan2 ldrsh r1, [r5, #0x78] mov r0, r0, lsl #0x10 rsb r0, r1, r0, asr #16 @@ -6878,7 +6878,7 @@ _02181cd4: bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x500 strh r0, [r1, #0x5c] _02181cfc: @@ -6917,7 +6917,7 @@ func_ov35_02181d1c: ; 0x02181d1c stmia r3, {r0, r1, r2} ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x500 ldrsh r2, [r1, #0x5c] mov r0, r0, lsl #0x10 @@ -8629,7 +8629,7 @@ _02183488: bl Vec3p_Sub ldr r0, [sp, #0x10] ldr r1, [sp, #0x18] - bl func_01ffa0f4 + bl Atan2 ldrsh r1, [r5, #0x78] mov r0, r0, lsl #0x10 rsb r0, r1, r0, asr #16 @@ -8677,7 +8677,7 @@ _021835b0: ldr r1, [r5, #0x50] sub r0, r3, r0 sub r1, r2, r1 - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 ldr r0, [r4, #0x14] mov r1, r1, asr #0x10 @@ -8765,7 +8765,7 @@ _021836d4: bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 ldrsh r2, [r7, #0x78] mov r0, r0, lsl #0x10 ldr r1, _02183760 ; =0x00005554 @@ -10326,7 +10326,7 @@ _02184bc4: bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 rsb r1, r4, r0, asr #16 mov r1, r1, lsl #0x10 @@ -10368,7 +10368,7 @@ _02184ce0: bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 ldr r0, [r5, #0x14] mov r1, r1, asr #0x10 @@ -10478,7 +10478,7 @@ func_ov35_02184d90: ; 0x02184d90 sub r0, r1, r0 ldr r1, [sp, #0x18] sub r1, r2, r1 - bl func_01ffa0f4 + bl Atan2 strh r0, [sp, #0xe] add r1, sp, #8 str r1, [sp] diff --git a/asm/ov36.inc b/asm/ov36.inc index 9576d4fc..08943fd7 100644 --- a/asm/ov36.inc +++ b/asm/ov36.inc @@ -109,7 +109,7 @@ .extern Vec3p_Sub .extern Vec3p_Length .extern Vec3p_Normalize -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffbe34 .extern func_01ffe1cc .extern func_01fffbec diff --git a/asm/ov36.s b/asm/ov36.s index b46fb7d5..5928578b 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -3273,7 +3273,7 @@ _0217ea64: beq _0217eacc ldr r0, [r6, #0xc4] ldr r1, [r6, #0xcc] - bl func_01ffa0f4 + bl Atan2 ldrsh r1, [r6, #0x78] mov r0, r0, lsl #0x10 rsb r0, r1, r0, asr #16 @@ -3501,7 +3501,7 @@ func_ov36_0217ed50: ; 0x0217ed50 beq _0217ede8 ldr r0, [r4, #0xc4] ldr r1, [r4, #0xcc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r4 mov r1, r1, asr #0x10 @@ -8394,7 +8394,7 @@ _02183360: ldr r1, _021834fc ; =gPlayerVel ldr r0, [r1] ldr r1, [r1, #8] - bl func_01ffa0f4 + bl Atan2 add r1, r5, #0x800 ldrsh r1, [r1, #0x9a] mov r0, r0, lsl #0x10 @@ -9071,7 +9071,7 @@ _02183ce8: bl Vec3p_Sub ldr r0, [sp, #0x30] ldr r1, [sp, #0x38] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 ldr ip, [r6, #0x864] ldrsh r2, [r6, #0x78] @@ -9266,7 +9266,7 @@ _02183fd0: ldr r1, [r6, #0x50] sub r0, r3, r0 sub r1, r2, r1 - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 ldr r0, [r5, #0x14] mov r1, r1, asr #0x10 @@ -9418,7 +9418,7 @@ _02184160: bl Vec3p_Sub ldr r0, [sp, #0x24] ldr r1, [sp, #0x2c] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -10992,7 +10992,7 @@ _021857a8: mov r4, r0, lsl #0x10 ldr r0, [r1] ldr r1, [r1, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 add r0, r0, #0x8000 diff --git a/asm/ov37.inc b/asm/ov37.inc index 9305436c..6e76b37c 100644 --- a/asm/ov37.inc +++ b/asm/ov37.inc @@ -110,7 +110,7 @@ .extern Vec3p_Normalize .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa9fc .extern func_01ffbe78 .extern func_01fffbec diff --git a/asm/ov37.s b/asm/ov37.s index 50f77bc0..487facbb 100644 --- a/asm/ov37.s +++ b/asm/ov37.s @@ -960,7 +960,7 @@ _0217c978: bl Vec3p_Sub ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] - bl func_01ffa0f4 + bl Atan2 ldrsh r1, [sp, #8] mov r0, r0, lsl #0x10 rsb r0, r1, r0, asr #16 @@ -1043,7 +1043,7 @@ _0217cadc: bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 ldrsh r1, [sp, #4] mov r0, r0, lsl #0x10 rsb r0, r1, r0, asr #16 @@ -8807,7 +8807,7 @@ _021839c0: str r0, [r6, #0xc] ldr r0, [r7, #0x124] ldr r1, [r7, #0x12c] - bl func_01ffa0f4 + bl Atan2 strh r0, [r5] mov r0, #0x6000 add sp, sp, #0x78 @@ -8844,7 +8844,7 @@ _02183a4c: str r0, [r6, #0xc] ldr r0, [r7, #0x184] ldr r1, [r7, #0x18c] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 sub r0, r0, #0x8000 @@ -8960,7 +8960,7 @@ _02183c04: str r0, [r6, #0xc] ldr r0, [r7, #0x2f8] ldr r1, [r7, #0x300] - bl func_01ffa0f4 + bl Atan2 ldr r1, _02183c50 ; =0x00002aab strh r0, [r5] strh r1, [r4] @@ -9757,7 +9757,7 @@ _0218457c: str r1, [r4, #0x68] ldr r0, [r4, #0x184] ldr r1, [r4, #0x18c] - bl func_01ffa0f4 + bl Atan2 strh r0, [r4, #0x78] add r0, r4, #0x60 bl Vec3p_Length @@ -9958,7 +9958,7 @@ _02184850: beq _021848cc ldr r0, [r5, #0xc4] ldr r1, [r5, #0xcc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r5 mov r1, r1, asr #0x10 @@ -9971,7 +9971,7 @@ _021848cc: beq _02184928 ldr r0, [r5, #0xc4] ldr r1, [r5, #0xcc] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r5 mov r1, r1, asr #0x10 diff --git a/asm/ov38.inc b/asm/ov38.inc index c1be74e5..4215f602 100644 --- a/asm/ov38.inc +++ b/asm/ov38.inc @@ -110,7 +110,7 @@ .extern Vec3p_Normalize .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffa94c .extern func_01ffa9fc .extern func_01fffb4c diff --git a/asm/ov38.s b/asm/ov38.s index c80b5688..a2851cc6 100644 --- a/asm/ov38.s +++ b/asm/ov38.s @@ -2185,7 +2185,7 @@ _0217dbbc: str r0, [r4, #0x68] ldr r0, [sp, #0x10] ldr r1, [sp, #0x18] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r2, #0x400 mov ip, #0xb6 @@ -2832,7 +2832,7 @@ func_ov38_0217e4e0: ; 0x0217e4e0 strh r3, [r1, #0x96] ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 add r1, r7, #0x1000 ldr r2, _0217e67c ; =0x00011fd7 strh r0, [r1, #0x94] @@ -8984,7 +8984,7 @@ _02183bf4: bl _ZN5Actor9GetHitboxEP8Cylinder ldr r0, [r4] ldr r1, [r4, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 diff --git a/asm/ov39.inc b/asm/ov39.inc index deced3af..8629ad42 100644 --- a/asm/ov39.inc +++ b/asm/ov39.inc @@ -111,7 +111,7 @@ .extern Vec3p_Length .extern Vec3p_Normalize .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01fffbec .extern func_01fffcd8 .extern func_01fffcec diff --git a/asm/ov39.s b/asm/ov39.s index 8e4edfc6..e69fb5d6 100644 --- a/asm/ov39.s +++ b/asm/ov39.s @@ -5282,7 +5282,7 @@ _02180528: str r0, [sp, #0x50] str r2, [sp, #0x54] str r1, [sp, #0x58] - bl func_01ffa0f4 + bl Atan2 add r1, r5, #0x100 strh r0, [r1, #0x60] add r0, sp, #0x50 @@ -7899,7 +7899,7 @@ _02182984: strne r0, [r5, #0x1a8] ldr r0, [r5, #0x60] ldr r1, [r5, #0x68] - bl func_01ffa0f4 + bl Atan2 add r1, r5, #0x100 strh r0, [r1, #0x60] ldrsh r1, [r1, #0x5e] @@ -8130,7 +8130,7 @@ _02182d98: beq _02182de4 ldr r0, [r5, #0x60] ldr r1, [r5, #0x68] - bl func_01ffa0f4 + bl Atan2 add r1, r5, #0x100 strh r0, [r1, #0x60] _02182de4: @@ -8326,7 +8326,7 @@ func_ov39_02182ffc: ; 0x02182ffc strne r0, [r4, #0x1a8] ldr r0, [r4, #0x60] ldr r1, [r4, #0x68] - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x100 strh r0, [r1, #0x60] ldr r0, [r4, #0x7fc] @@ -9845,7 +9845,7 @@ _021845e0: ldr r2, [sp, #0x24] mov r1, r0 sub r0, r3, r2 - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r2, r0, asr #0x10 add r0, sp, #8 @@ -9860,7 +9860,7 @@ _021845e0: ldr r2, [sp, #0xc] ldr r0, [sp, #0x18] sub r0, r2, r0 - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 str r0, [sp, #0x3c] @@ -11540,7 +11540,7 @@ func_ov39_02185c3c: ; 0x02185c3c ldr r0, [sp, #0x1c] ldrsh r4, [r1] ldr r1, [sp, #0x24] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 rsbs r1, r4, r0, asr #16 ldr r0, _02185e90 ; =0x000031c7 diff --git a/asm/ov41.inc b/asm/ov41.inc index 675e3839..995fa139 100644 --- a/asm/ov41.inc +++ b/asm/ov41.inc @@ -112,7 +112,7 @@ .extern Vec3p_Add .extern Vec3p_Sub .extern Vec3p_Axpy -.extern func_01ffa0f4 +.extern Atan2 .extern func_01fffcec .extern func_02018450 .extern func_020196bc diff --git a/asm/ov41.s b/asm/ov41.s index 6519040e..26f7832c 100644 --- a/asm/ov41.s +++ b/asm/ov41.s @@ -2230,7 +2230,7 @@ _0218b130: bl _ZN5Actor9GetHitboxEP8Cylinder ldr r0, [r4] ldr r1, [r4, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 diff --git a/asm/ov43.inc b/asm/ov43.inc index 0e79cbaa..83c90d09 100644 --- a/asm/ov43.inc +++ b/asm/ov43.inc @@ -80,7 +80,7 @@ .extern Vec3p_Add .extern Vec3p_Sub .extern Vec3p_Axpy -.extern func_01ffa0f4 +.extern Atan2 .extern func_01fffcec .extern func_01fffd04 .extern func_0201e544 diff --git a/asm/ov43.s b/asm/ov43.s index 00871499..53939bab 100644 --- a/asm/ov43.s +++ b/asm/ov43.s @@ -600,7 +600,7 @@ func_ov43_02189c8c: ; 0x02189c8c bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 cmp r6, #0 @@ -660,7 +660,7 @@ _02189d70: ldr r1, [sp, #8] str r1, [r7, #0x68] ldr r0, [r7, #0x60] - bl func_01ffa0f4 + bl Atan2 ldrsh r2, [r7, #0x78] mov r0, r0, lsl #0x10 ldr r1, _02189e80 ; =0xffff8001 diff --git a/asm/ov44.inc b/asm/ov44.inc index 9a9a2958..66a4437b 100644 --- a/asm/ov44.inc +++ b/asm/ov44.inc @@ -84,7 +84,7 @@ .extern Vec3p_Add .extern Vec3p_Sub .extern Vec3p_Axpy -.extern func_01ffa0f4 +.extern Atan2 .extern func_01fffcec .extern func_01fffd04 .extern func_02002bf4 diff --git a/asm/ov44.s b/asm/ov44.s index 09627821..f6859e20 100644 --- a/asm/ov44.s +++ b/asm/ov44.s @@ -4603,7 +4603,7 @@ _0218cc18: ldmeqia sp!, {r3, r4, pc} ldr r0, [r4, #0xc4] ldr r1, [r4, #0xcc] - bl func_01ffa0f4 + bl Atan2 strh r0, [r4, #0x78] add sp, sp, #0xc ldmia sp!, {r3, r4, pc} @@ -4636,7 +4636,7 @@ func_ov44_0218cc70: ; 0x0218cc70 bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 ldr r2, _0218cd94 ; =0x0000038e @@ -4997,7 +4997,7 @@ _0218d168: beq _0218d234 ldr r0, [r4, #0xc4] ldr r1, [r4, #0xcc] - bl func_01ffa0f4 + bl Atan2 strh r0, [r4, #0x78] mov r0, r4 mov r1, #0 @@ -5037,7 +5037,7 @@ _0218d1fc: beq _0218d234 ldr r0, [r4, #0xc4] ldr r1, [r4, #0xcc] - bl func_01ffa0f4 + bl Atan2 strh r0, [r4, #0x78] mov r0, r4 mov r1, #0 @@ -5597,7 +5597,7 @@ func_ov44_0218d87c: ; 0x0218d87c bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl func_0202bbbc diff --git a/asm/ov47.inc b/asm/ov47.inc index 4ed510ff..59dca001 100644 --- a/asm/ov47.inc +++ b/asm/ov47.inc @@ -87,7 +87,7 @@ .extern Vec3p_Length .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffbe78 .extern func_01fffb4c .extern func_01fffbec diff --git a/asm/ov47.s b/asm/ov47.s index abfd79ad..72ca6922 100644 --- a/asm/ov47.s +++ b/asm/ov47.s @@ -2442,7 +2442,7 @@ _02191fc8: ; jump table _02191fe4: ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 ldrsh r2, [r5, #0x78] mov r0, r0, lsl #0x10 ldr r1, _02192310 ; =0xffff8001 @@ -2524,7 +2524,7 @@ _021920f0: _02192110: ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 ldrsh r2, [r5, #0x78] mov r0, r0, lsl #0x10 ldr r1, _02192310 ; =0xffff8001 @@ -2564,7 +2564,7 @@ _02192188: _021921a4: ldr r0, [r4, #4] ldr r1, [r4, #0xc] - bl func_01ffa0f4 + bl Atan2 ldrsh r1, [r5, #0x78] mov r0, r0, lsl #0x10 ldr r2, _02192310 ; =0xffff8001 diff --git a/asm/ov48.inc b/asm/ov48.inc index 17a83e09..dd7a54f6 100644 --- a/asm/ov48.inc +++ b/asm/ov48.inc @@ -151,7 +151,7 @@ .extern Vec3p_Cross .extern Vec3p_Normalize .extern Vec3p_Axpy -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffbf5c .extern func_01fffcec .extern func_01fffd04 diff --git a/asm/ov48.s b/asm/ov48.s index 5b9c6dbb..02be7ecf 100644 --- a/asm/ov48.s +++ b/asm/ov48.s @@ -2926,11 +2926,11 @@ _021921cc: ldr r0, [r4, #0xc4] ldr r1, [r4, #0xcc] bge _021922b8 - bl func_01ffa0f4 + bl Atan2 strh r0, [r4, #0x78] ldmia sp!, {r4, pc} _021922b8: - bl func_01ffa0f4 + bl Atan2 ldrsh r1, [r4, #0x78] mov r0, r0, lsl #0x10 sub r1, r1, #0x8000 @@ -4054,7 +4054,7 @@ _02193240: bl Vec3p_Sub ldr r0, [sp, #0x54] ldr r1, [sp, #0x5c] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -4083,7 +4083,7 @@ _021932c4: bl Vec3p_Sub ldr r0, [sp, #0x24] ldr r1, [sp, #0x2c] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 diff --git a/asm/ov50.inc b/asm/ov50.inc index d3b0c055..433f0c62 100644 --- a/asm/ov50.inc +++ b/asm/ov50.inc @@ -101,7 +101,7 @@ .extern Vec3p_Normalize .extern Vec3p_Axpy .extern func_01ff9ec0 -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffec34 .extern func_01fffbec .extern func_01fffd04 diff --git a/asm/ov50.s b/asm/ov50.s index c22d8be6..5984922b 100644 --- a/asm/ov50.s +++ b/asm/ov50.s @@ -733,11 +733,11 @@ _02195eb0: beq _02195f34 ldr r0, [sp, #0x24] ldr r1, [sp, #0x2c] - bl func_01ffa0f4 + bl Atan2 mov r6, r0, lsl #0x10 ldr r0, [r5, #0xc4] ldr r1, [r5, #0xcc] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 sub r0, r0, r6, asr #16 @@ -2725,7 +2725,7 @@ func_ov50_021978fc: ; 0x021978fc bl func_0202db30 ldr r0, [r4, #0x60] ldr r1, [r4, #0x68] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 ldr r2, _021979b0 ; =0x0000071c @@ -2812,7 +2812,7 @@ func_ov50_02197a00: ; 0x02197a00 _02197a78: ldr r0, [r4, #0x60] ldr r1, [r4, #0x68] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 ldr r2, _02197ad8 ; =0x00000aab @@ -2868,7 +2868,7 @@ func_ov50_02197b10: ; 0x02197b10 mov r4, r0 ldr r0, [r4, #0x60] ldr r1, [r4, #0x68] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 add r0, r4, #0x78 @@ -3251,7 +3251,7 @@ _02197ff8: bl Vec3p_Sub ldr r0, [sp, #0x2c] ldr r1, [sp, #0x34] - bl func_01ffa0f4 + bl Atan2 ldr r1, _02198580 ; =data_027e0764 mov r0, r0, lsl #0x10 ldr r3, [r1] @@ -3413,7 +3413,7 @@ _02198258: stmia r3, {r0, r1, r2} ldr r0, [sp, #0x20] ldr r1, [sp, #0x28] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r4 mov r1, r1, asr #0x10 @@ -3472,7 +3472,7 @@ _02198340: stmia r3, {r0, r1, r2} ldr r0, [sp, #0x14] ldr r1, [sp, #0x1c] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r4 mov r1, r1, asr #0x10 @@ -3510,7 +3510,7 @@ _021983c4: stmia r3, {r0, r1, r2} ldr r0, [sp, #8] ldr r1, [sp, #0x10] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r4 mov r1, r1, asr #0x10 diff --git a/asm/ov51.inc b/asm/ov51.inc index 1dd38451..133f4f7e 100644 --- a/asm/ov51.inc +++ b/asm/ov51.inc @@ -84,7 +84,7 @@ .extern Vec3p_Sub .extern Vec3p_Normalize .extern Vec3p_Axpy -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffe1cc .extern func_01fffcec .extern func_01fffd04 diff --git a/asm/ov51.s b/asm/ov51.s index 8dea6c30..fbb28c56 100644 --- a/asm/ov51.s +++ b/asm/ov51.s @@ -1517,7 +1517,7 @@ func_ov51_021967e8: ; 0x021967e8 bl Vec3p_Sub ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r3, r0, asr #0x10 mov r0, r3, lsl #0x10 @@ -1659,7 +1659,7 @@ func_ov51_02196924: ; 0x02196924 str r3, [sp, #0x60] ldr r2, [r2, #0x48] str r2, [sp, #0x64] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 sub r0, r0, #0x8000 @@ -2201,7 +2201,7 @@ func_ov51_021970a0: ; 0x021970a0 beq _02197260 ldr r0, [r7, #0x60] ldr r1, [r7, #0x68] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl func_0202bbbc @@ -2245,7 +2245,7 @@ func_ov51_021970a0: ; 0x021970a0 ble _021971d8 ldr r0, [sp, #0x14] ldr r1, [sp, #0x1c] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 sub r0, r5, r0, asr #16 mov r0, r0, lsl #0x10 @@ -2284,7 +2284,7 @@ _021971e4: stmia r3, {r0, r1, r2} ldr r0, [sp, #8] ldr r1, [sp, #0x10] - bl func_01ffa0f4 + bl Atan2 mov r0, r0, lsl #0x10 sub r0, r5, r0, asr #16 mov r0, r0, lsl #0x10 diff --git a/asm/ov59.inc b/asm/ov59.inc index fca11f34..347da6de 100644 --- a/asm/ov59.inc +++ b/asm/ov59.inc @@ -34,7 +34,7 @@ .extern func_01ff88b0 .extern Vec3p_Add .extern Vec3p_Sub -.extern func_01ffa0f4 +.extern Atan2 .extern func_01ffbf5c .extern func_01fffcd8 .extern func_01fffcec diff --git a/asm/ov59.s b/asm/ov59.s index 3e6bf592..a2fbfd52 100644 --- a/asm/ov59.s +++ b/asm/ov59.s @@ -294,7 +294,7 @@ func_ov59_02198ffc: ; 0x02198ffc bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] - bl func_01ffa0f4 + bl Atan2 mov r1, r0, lsl #0x10 mov r0, r4 mov r4, r1, asr #0x10 @@ -561,7 +561,7 @@ _021993b4: bl Vec3p_Sub ldr r0, [sp, #0xa4] ldr r1, [sp, #0xac] - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x300 strh r0, [r1, #0x40] ldr r0, [r4, #0x344] @@ -592,7 +592,7 @@ _02199408: bl Vec3p_Sub ldr r0, [sp, #0x8c] ldr r1, [sp, #0x94] - bl func_01ffa0f4 + bl Atan2 add r2, r4, #0x300 strh r0, [r2, #0x40] ldr r1, [sp, #0x98] @@ -899,7 +899,7 @@ _021998b8: bl Vec3p_Sub ldr r0, [sp, #0x68] ldr r1, [sp, #0x70] - bl func_01ffa0f4 + bl Atan2 add r1, r4, #0x300 strh r0, [r1, #0x40] ldr r0, [r4, #0x348] diff --git a/include/lib/math.h b/include/lib/math.h index a39974cc..04fd2db4 100644 --- a/include/lib/math.h +++ b/include/lib/math.h @@ -55,6 +55,10 @@ typedef struct { /* 24 */ } Mat3p; +#define DEG_TO_ANG(n) ((n) * 0x10000 / 360) + +extern "C" s16 Atan2(s32 x, s32 y); + extern "C" u32 FastDivide(u32 a, u32 b); extern "C" u32 Divide(u32 a, u32 b); extern "C" bool Approach(unk32 *src, unk32 dest, unk32 step);