From b5764f424aacbc9f67e57ab4359c61d6322eee98 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 19 May 2024 12:58:22 +0200 Subject: [PATCH] Name `Vec3p` functions and `abs` --- asm/itcm.s | 168 +++--- asm/main/main_02000000.inc | 12 +- asm/main/main_02000000.s | 138 ++--- asm/main/main_0203e8a0.s | 8 +- asm/ov00/Actor/Actor.inc | 8 +- asm/ov00/Actor/Actor.s | 36 +- asm/ov00/Map/MapManager.inc | 10 +- asm/ov00/Map/MapManager.s | 72 +-- asm/ov00/Player/LinkStateBase.inc | 2 +- asm/ov00/Player/LinkStateBase.s | 2 +- asm/ov00/Player/LinkStateDamage.inc | 2 +- asm/ov00/Player/LinkStateDamage.s | 6 +- asm/ov00/Player/LinkStateFollow.inc | 4 +- asm/ov00/Player/LinkStateFollow.s | 4 +- asm/ov00/Player/LinkStateInteract.inc | 8 +- asm/ov00/Player/LinkStateInteract.s | 32 +- asm/ov00/Player/PlayerBase.inc | 2 +- asm/ov00/Player/PlayerBase.s | 2 +- asm/ov00/Player/PlayerControl.inc | 8 +- asm/ov00/Player/PlayerControl.s | 28 +- asm/ov00/ov00_020773c0.inc | 2 +- asm/ov00/ov00_020773c0.s | 2 +- asm/ov00/ov00_02086cd0.inc | 12 +- asm/ov00/ov00_02086cd0.s | 210 +++---- asm/ov00/ov00_020980f4.inc | 10 +- asm/ov00/ov00_020980f4.s | 28 +- asm/ov00/ov00_020b1498.inc | 12 +- asm/ov00/ov00_020b1498.s | 130 ++--- asm/ov00/ov00_020c3e54.inc | 16 +- asm/ov00/ov00_020c3e54.s | 86 +-- asm/ov00/ov00_020d59f0.inc | 4 +- asm/ov02.inc | 2 +- asm/ov02.s | 4 +- asm/ov04.inc | 4 +- asm/ov04.s | 6 +- asm/ov05.inc | 8 +- asm/ov05.s | 60 +- asm/ov09.inc | 4 +- asm/ov09.s | 22 +- asm/ov12.inc | 12 +- asm/ov12.s | 128 ++--- asm/ov14/Actor/ActorRupee.inc | 2 +- asm/ov14/Actor/ActorRupee.s | 2 +- asm/ov14/ov14_0211f640.inc | 12 +- asm/ov14/ov14_0211f640.s | 284 +++++----- asm/ov14/ov14_0213b778.inc | 10 +- asm/ov14/ov14_0213b778.s | 110 ++-- asm/ov15.inc | 16 +- asm/ov15.s | 784 +++++++++++++------------- asm/ov17.inc | 6 +- asm/ov17.s | 104 ++-- asm/ov18.inc | 6 +- asm/ov18.s | 100 ++-- asm/ov19.inc | 10 +- asm/ov19.s | 40 +- asm/ov20.inc | 10 +- asm/ov20.s | 42 +- asm/ov21.inc | 6 +- asm/ov21.s | 22 +- asm/ov22.inc | 12 +- asm/ov22.s | 100 ++-- asm/ov23.inc | 12 +- asm/ov23.s | 92 +-- asm/ov24.inc | 10 +- asm/ov24.s | 38 +- asm/ov25.inc | 12 +- asm/ov25.s | 60 +- asm/ov26.inc | 10 +- asm/ov26.s | 86 +-- asm/ov27.inc | 8 +- asm/ov27.s | 78 +-- asm/ov28.inc | 10 +- asm/ov28.s | 24 +- asm/ov29.inc | 12 +- asm/ov29.s | 90 +-- asm/ov30.inc | 6 +- asm/ov30.s | 16 +- asm/ov31.inc | 6 +- asm/ov31.s | 14 +- asm/ov32.inc | 8 +- asm/ov32.s | 28 +- asm/ov33.inc | 6 +- asm/ov33.s | 18 +- asm/ov34.inc | 6 +- asm/ov34.s | 74 +-- asm/ov35.inc | 8 +- asm/ov35.s | 70 +-- asm/ov36.inc | 8 +- asm/ov36.s | 44 +- asm/ov37.inc | 14 +- asm/ov37.s | 54 +- asm/ov38.inc | 14 +- asm/ov38.s | 200 +++---- asm/ov39.inc | 8 +- asm/ov39.s | 74 +-- asm/ov40.inc | 4 +- asm/ov40.s | 18 +- asm/ov41.inc | 6 +- asm/ov41.s | 10 +- asm/ov43.inc | 6 +- asm/ov43.s | 12 +- asm/ov44.inc | 8 +- asm/ov44.s | 42 +- asm/ov46.inc | 14 +- asm/ov46.s | 58 +- asm/ov47.inc | 10 +- asm/ov47.s | 20 +- asm/ov48.inc | 10 +- asm/ov48.s | 54 +- asm/ov49.inc | 2 +- asm/ov49.s | 16 +- asm/ov50.inc | 10 +- asm/ov50.s | 28 +- asm/ov51.inc | 8 +- asm/ov51.s | 22 +- asm/ov52.inc | 4 +- asm/ov52.s | 4 +- asm/ov53.inc | 4 +- asm/ov53.s | 8 +- asm/ov54.inc | 4 +- asm/ov54.s | 4 +- asm/ov55.inc | 2 +- asm/ov55.s | 4 +- asm/ov56.inc | 2 +- asm/ov56.s | 2 +- asm/ov57.inc | 6 +- asm/ov57.s | 18 +- asm/ov58.inc | 8 +- asm/ov58.s | 24 +- asm/ov59.inc | 4 +- asm/ov59.s | 10 +- include/lib/math.h | 8 + libs/c/include/stdlib.h | 6 + 133 files changed, 2352 insertions(+), 2338 deletions(-) create mode 100644 libs/c/include/stdlib.h diff --git a/asm/itcm.s b/asm/itcm.s index 9ed2867a..7832436b 100644 --- a/asm/itcm.s +++ b/asm/itcm.s @@ -2097,9 +2097,9 @@ _01ff9bbc: .word 0x04000280 _01ff9bc0: .word 0x040002a8 arm_func_end func_01ff9b88 - .global func_01ff9bc4 - arm_func_start func_01ff9bc4 -func_01ff9bc4: ; 0x01ff9bc4 + .global Vec3p_Add + arm_func_start Vec3p_Add +Vec3p_Add: ; 0x01ff9bc4 ldr ip, [r0] ldr r3, [r1] add r3, ip, r3 @@ -2113,11 +2113,11 @@ func_01ff9bc4: ; 0x01ff9bc4 add r0, r3, r0 str r0, [r2, #8] bx lr - arm_func_end func_01ff9bc4 + arm_func_end Vec3p_Add - .global func_01ff9bf8 - arm_func_start func_01ff9bf8 -func_01ff9bf8: ; 0x01ff9bf8 + .global Vec3p_Sub + arm_func_start Vec3p_Sub +Vec3p_Sub: ; 0x01ff9bf8 ldr ip, [r0] ldr r3, [r1] sub r3, ip, r3 @@ -2131,11 +2131,11 @@ func_01ff9bf8: ; 0x01ff9bf8 sub r0, r3, r0 str r0, [r2, #8] bx lr - arm_func_end func_01ff9bf8 + arm_func_end Vec3p_Sub - .global func_01ff9c2c - arm_func_start func_01ff9c2c -func_01ff9c2c: ; 0x01ff9c2c + .global Vec3p_Dot + arm_func_start Vec3p_Dot +Vec3p_Dot: ; 0x01ff9c2c stmdb sp!, {r4, lr} ldr r3, [r0, #4] ldr r2, [r1, #4] @@ -2151,11 +2151,11 @@ func_01ff9c2c: ; 0x01ff9c2c mov r0, r0, lsr #0xc orr r0, r0, r1, lsl #20 ldmia sp!, {r4, pc} - arm_func_end func_01ff9c2c + arm_func_end Vec3p_Dot - .global func_01ff9c68 - arm_func_start func_01ff9c68 -func_01ff9c68: ; 0x01ff9c68 + .global Vec3p_Cross + arm_func_start Vec3p_Cross +Vec3p_Cross: ; 0x01ff9c68 stmdb sp!, {r4, r5, r6, r7, r8, lr} ldmia r0, {r5, lr} ldr r6, [r1, #8] @@ -2189,11 +2189,11 @@ func_01ff9c68: ; 0x01ff9c68 orr r1, r1, r0, lsl #20 str r1, [r2, #8] ldmia sp!, {r4, r5, r6, r7, r8, pc} - arm_func_end func_01ff9c68 + arm_func_end Vec3p_Cross - .global func_01ff9cec - arm_func_start func_01ff9cec -func_01ff9cec: ; 0x01ff9cec + .global Vec3p_Length + arm_func_start Vec3p_Length +Vec3p_Length: ; 0x01ff9cec ldr r1, [r0, #4] ldr r2, [r0] smull ip, r3, r1, r1 @@ -2220,11 +2220,11 @@ _01ff9d24: .align 2, 0 _01ff9d44: .word 0x040002b0 _01ff9d48: .word 0x040002b4 - arm_func_end func_01ff9cec + arm_func_end Vec3p_Length - .global func_01ff9d4c - arm_func_start func_01ff9d4c -func_01ff9d4c: ; 0x01ff9d4c + .global Vec3p_Normalize + arm_func_start Vec3p_Normalize +Vec3p_Normalize: ; 0x01ff9d4c stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr} ldr r2, [r0, #4] ldr r3, [r0] @@ -2298,11 +2298,11 @@ _01ff9dc0: _01ff9e58: .word 0x04000280 _01ff9e5c: .word 0x040002b4 _01ff9e60: .word 0x040002a0 - arm_func_end func_01ff9d4c + arm_func_end Vec3p_Normalize - .global func_01ff9e64 - arm_func_start func_01ff9e64 -func_01ff9e64: ; 0x01ff9e64 + .global Vec3p_Axpy + arm_func_start Vec3p_Axpy +Vec3p_Axpy: ; 0x01ff9e64 stmdb sp!, {r4, lr} ldr r4, [r1] ldr lr, [r2] @@ -2326,7 +2326,7 @@ func_01ff9e64: ; 0x01ff9e64 add r0, ip, r0 str r0, [r3, #8] ldmia sp!, {r4, pc} - arm_func_end func_01ff9e64 + arm_func_end Vec3p_Axpy .global func_01ff9ec0 arm_func_start func_01ff9ec0 @@ -4436,7 +4436,7 @@ _01ffb848: _01ffb90c: add r0, sp, #0x24 add r1, sp, #0 - bl func_01ff9c2c + bl Vec3p_Dot movs r1, r0 beq _01ffb980 ldr r0, [r7] @@ -4447,7 +4447,7 @@ _01ffb90c: _01ffb934: add r0, sp, #0x18 add r1, sp, #0 - bl func_01ff9c2c + bl Vec3p_Dot movs r1, r0 beq _01ffb980 ldr r0, [r7, #4] @@ -4458,7 +4458,7 @@ _01ffb934: _01ffb95c: add r0, sp, #0xc add r1, sp, #0 - bl func_01ff9c2c + bl Vec3p_Dot movs r1, r0 beq _01ffb980 ldr r0, [r7, #8] @@ -4478,11 +4478,11 @@ _01ffb980: mov r6, r0 add r0, sp, #0xc add r1, sp, #0 - bl func_01ff9c2c + bl Vec3p_Dot mov r11, r0 add r0, sp, #0x18 add r1, sp, #0 - bl func_01ff9c2c + bl Vec3p_Dot smull r3, r2, r0, r6 adds r3, r3, #0x800 smull r1, r0, r11, r6 @@ -4508,11 +4508,11 @@ _01ffb9fc: mov r6, r0 add r0, sp, #0xc add r1, sp, #0 - bl func_01ff9c2c + bl Vec3p_Dot mov r11, r0 add r0, sp, #0x24 add r1, sp, #0 - bl func_01ff9c2c + bl Vec3p_Dot smull r3, r2, r0, r6 adds r3, r3, #0x800 smull r1, r0, r11, r6 @@ -4539,11 +4539,11 @@ _01ffba74: mov r6, r0 add r0, sp, #0x18 add r1, sp, #0 - bl func_01ff9c2c + bl Vec3p_Dot mov r11, r0 add r0, sp, #0x24 add r1, sp, #0 - bl func_01ff9c2c + bl Vec3p_Dot smull r3, r2, r0, r6 adds r3, r3, #0x800 smull r1, r0, r11, r6 @@ -4591,7 +4591,7 @@ _01ffbafc: beq _01ffbb74 add r0, sp, #0x24 add r1, sp, #0 - bl func_01ff9c2c + bl Vec3p_Dot ldr r1, [r7] add r0, r1, r0 str r0, [r5] @@ -4601,7 +4601,7 @@ _01ffbb74: beq _01ffbb98 add r0, sp, #0x18 add r1, sp, #0 - bl func_01ff9c2c + bl Vec3p_Dot ldr r1, [r7, #4] add r0, r1, r0 str r0, [r5, #4] @@ -4612,7 +4612,7 @@ _01ffbb98: ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} add r0, sp, #0xc add r1, sp, #0 - bl func_01ff9c2c + bl Vec3p_Dot ldr r1, [r7, #8] add r0, r1, r0 str r0, [r5, #8] @@ -4841,11 +4841,11 @@ func_01ffbe78: ; 0x01ffbe78 mov r0, lr mov r2, lr mov r1, r4 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x20 mov r1, r4 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, [r4, #0xc] ldr r1, [sp, #0x4c] str r2, [sp] @@ -4874,7 +4874,7 @@ func_01ffbe78: ; 0x01ffbe78 ldr r3, [r5, #8] mov r2, r0 str r3, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp, #0x14] mov r0, #1 str r1, [r5] @@ -4906,10 +4906,10 @@ func_01ffbf5c: ; 0x01ffbf5c add r2, sp, #0x30 mov r0, r9 mov r1, r3 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x30 mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot smull r2, r1, r8, r8 adds r2, r2, #0x800 adc r1, r1, #0 @@ -5204,7 +5204,7 @@ _01ffc398: ldr r0, [sp, #0x18] mov r1, r3 add r2, sp, #0x248 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r5 ldr r3, [r0] mov r1, r7 @@ -5778,7 +5778,7 @@ _01ffcab4: add r0, sp, #0x194 add r1, sp, #0x188 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add cmp r11, #0 mov r7, #0 beq _01ffcd18 @@ -6149,7 +6149,7 @@ func_01ffd1e0: ; 0x01ffd1e0 ldr r8, [sp, #0x348] ldr r7, [sp, #0x34c] ldr r11, [sp, #0x354] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x350] tst r0, #4 mvn r0, #0 @@ -6205,7 +6205,7 @@ func_01ffd1e0: ; 0x01ffd1e0 mov r0, r4 mov r1, r3 add r2, sp, #0x2b0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x14] bl _ZN10MapManager17Get_MapData_Unk28Ev str r0, [sp, #0x30] @@ -6348,7 +6348,7 @@ _01ffd4e4: ldr r0, [sp, #0x18] mov r1, r9 add r2, sp, #0x278 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r5 ldr r3, [r0] mov r1, r7 @@ -6469,7 +6469,7 @@ _01ffd678: mov r0, r4 mov r1, r3 add r2, sp, #0x2b0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x24] mov r5, #0 cmp r0, #0 @@ -6853,7 +6853,7 @@ _01ffdac4: add r0, sp, #0x1f4 add r1, sp, #0x1e8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 cmp r11, #0 str r0, [sp, #0x20] @@ -6914,11 +6914,11 @@ _01ffdd50: add r0, sp, #0x2c8 add r1, sp, #0x1dc mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x2c8 add r1, sp, #0x2bc add r2, sp, #0x2b0 - bl func_01ff9bf8 + bl Vec3p_Sub _01ffde00: add r6, r6, #1 cmp r6, r7 @@ -6937,7 +6937,7 @@ _01ffde0c: mov r0, r4 mov r1, r3 add r2, sp, #0x2b0 - bl func_01ff9bf8 + bl Vec3p_Sub cmp r7, #0 mov r5, #0 ble _01ffdfa8 @@ -7113,7 +7113,7 @@ _01ffdfa8: add r0, sp, #0x1c4 add r1, sp, #0x1b8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0x40] add r3, sp, #0x7c strh r0, [sp, #0x78] @@ -7207,7 +7207,7 @@ func_01ffe1cc: ; 0x01ffe1cc add r2, sp, #0x60 mov r0, r4 mov r1, r10 - bl func_01ff9bf8 + bl Vec3p_Sub add r4, sp, #0x48 ldmia r10, {r0, r1, r2} stmia r4, {r0, r1, r2} @@ -7481,13 +7481,13 @@ func_01ffe61c: ; 0x01ffe61c mov r1, r2 mov r7, r0 mov r5, r3 - bl func_01ff9c2c + bl Vec3p_Dot movs r4, r0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r7 mov r1, r6 - bl func_01ff9c2c + bl Vec3p_Dot ldr r2, [r7, #0xc] mov r1, r4 sub r0, r2, r0 @@ -7506,7 +7506,7 @@ func_01ffe668: ; 0x01ffe668 add r0, r10, #8 mov r9, r1 str r2, [sp] - bl func_01ff9c2c + bl Vec3p_Dot ldr r2, [r10, #0x14] ldr r1, [r9, #0xc] sub r0, r0, r2 @@ -7529,7 +7529,7 @@ _01ffe6b0: _01ffe6c8: mov r1, r9 add r0, r4, r8, lsl #4 - bl func_01ff9c2c + bl Vec3p_Dot add r1, r10, r8, lsl #4 ldr r2, [r1, #0x24] ldr r1, [r9, #0xc] @@ -7597,7 +7597,7 @@ _01ffe750: mla r0, r3, r1, r7 mla r1, r2, r1, r7 add r2, sp, #0x14 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r6, lsl #0x1 ldr r2, [r10, #0x48] ldrh r1, [r10, r0] @@ -7606,16 +7606,16 @@ _01ffe750: mla r0, r1, r0, r2 add r2, sp, #8 mov r1, r9 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x14 add r1, sp, #8 - bl func_01ff9c2c + bl Vec3p_Dot mov r6, r0 cmp r6, #0 ble _01ffe868 add r0, sp, #0x14 mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot cmp r6, r0 bgt _01ffe868 smull r1, r0, r5, r5 @@ -7738,7 +7738,7 @@ _01ffe954: _01ffe9d4: mov r0, r6 mov r1, r4 - bl func_01ff9c2c + bl Vec3p_Dot add r1, r7, r5, lsl #4 ldr r1, [r1, #0x24] sub r0, r0, r1 @@ -7774,7 +7774,7 @@ func_01ffea18: ; 0x01ffea18 ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, pc} mov r1, r6 add r0, r7, #8 - bl func_01ff9c2c + bl Vec3p_Dot ldr r1, [r7, #0x14] subs r0, r0, r1 addmi sp, sp, #0x18 @@ -7782,7 +7782,7 @@ func_01ffea18: ; 0x01ffea18 ldmmiia sp!, {r4, r5, r6, r7, r8, r9, r10, pc} mov r1, r5 add r0, r7, #8 - bl func_01ff9c2c + bl Vec3p_Dot mov r1, r0 ldr r0, [r6, #0xc] rsb r1, r1, #0 @@ -7830,7 +7830,7 @@ _01ffeab4: str r0, [sp, #0x14] add r1, sp, #0xc add r0, r7, #8 - bl func_01ff9c2c + bl Vec3p_Dot ldr r2, [r7, #0x14] ldr r1, [r6, #0xc] sub r0, r0, r2 @@ -7844,7 +7844,7 @@ _01ffeab4: _01ffeb5c: mov r0, r10 mov r1, r8 - bl func_01ff9c2c + bl Vec3p_Dot add r1, r7, r9, lsl #4 ldr r2, [r1, #0x24] ldr r1, [r6, #0xc] @@ -7863,10 +7863,10 @@ _01ffeb5c: mov r0, r3 mov r1, r5 mov r2, r3 - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #0 add r0, r7, #8 - bl func_01ff9c2c + bl Vec3p_Dot ldr r1, [r7, #0x14] ldr r2, [r6, #0xc] sub r0, r0, r1 @@ -7975,14 +7975,14 @@ _01ffecac: str r4, [sp, #0x14] str r4, [sp, #0x18] str r4, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x20 add r1, sp, #8 mov r2, r0 str r4, [sp, #8] str r4, [sp, #0xc] str r4, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #4 add r1, r10, #0x44 add r2, sp, #0x2c @@ -8598,7 +8598,7 @@ func_01fff510: ; 0x01fff510 mov r0, r5 mov r1, r3 add r2, sp, #0xc4 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x160 ldrh r0, [r0, #0x14] str r0, [sp, #8] @@ -9007,7 +9007,7 @@ func_01fffb4c: ; 0x01fffb4c moveq r0, #0 ldmeqia sp!, {r3, pc} mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize mov r0, #1 ldmia sp!, {r3, pc} arm_func_end func_01fffb4c @@ -9081,15 +9081,15 @@ func_01fffc44: ; 0x01fffc44 add r2, sp, #0xc mov r5, r1 mov r4, r3 - bl func_01ff9bf8 + bl Vec3p_Sub add r2, sp, #0 mov r0, r4 mov r1, r5 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0xc add r1, sp, #0 mov r2, r6 - bl func_01ff9c68 + bl Vec3p_Cross mov r0, r6 bl func_01fffb4c add sp, sp, #0x18 @@ -9104,13 +9104,13 @@ func_01fffc94: ; 0x01fffc94 add r2, sp, #0 mov r6, r0 mov r5, r1 - bl func_01ff9c68 + bl Vec3p_Cross add r0, sp, #0 - bl func_01ff9cec + bl Vec3p_Length mov r4, r0 mov r0, r6 mov r1, r5 - bl func_01ff9c2c + bl Vec3p_Dot mov r1, r0 mov r0, r4 bl func_01ff9f3c @@ -9237,13 +9237,13 @@ _01fffdf4: add r2, sp, #0x38 add r0, r6, #0xb8 add r1, r6, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [sp, #0x3c] add r0, r6, #0x148 add r1, sp, #0x38 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r6, #0xb8] str r0, [r6, #0x48] ldr r0, [r6, #0xbc] diff --git a/asm/main/main_02000000.inc b/asm/main/main_02000000.inc index 9240fb91..63ffb85d 100644 --- a/asm/main/main_02000000.inc +++ b/asm/main/main_02000000.inc @@ -274,12 +274,12 @@ .extern func_01ff9b24 .extern func_01ff9b4c .extern func_01ff9b88 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c2c -.extern func_01ff9c68 -.extern func_01ff9cec -.extern func_01ff9d4c +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Dot +.extern Vec3p_Cross +.extern Vec3p_Length +.extern Vec3p_Normalize .extern func_01ff9ec0 .extern func_01ff9f3c .extern func_01ffa0f4 diff --git a/asm/main/main_02000000.s b/asm/main/main_02000000.s index 4ce77867..12107442 100644 --- a/asm/main/main_02000000.s +++ b/asm/main/main_02000000.s @@ -7576,18 +7576,18 @@ func_02005dcc: ; 0x02005dcc mov r8, r3 str r2, [sp, #0x20] ldr r7, [sp, #0x40] - bl func_01ff9d4c + bl Vec3p_Normalize add r1, sp, #0x18 add r2, sp, #0xc mov r0, r4 - bl func_01ff9c68 + bl Vec3p_Cross add r0, sp, #0xc mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, sp, #0x18 add r1, sp, #0xc add r2, sp, #0 - bl func_01ff9c68 + bl Vec3p_Cross cmp r8, #0 beq _02005eac ldr r1, _02005f54 ; =0x04000440 @@ -7615,15 +7615,15 @@ func_02005dcc: ; 0x02005dcc _02005eac: add r1, sp, #0xc mov r0, r9 - bl func_01ff9c2c + bl Vec3p_Dot rsb r4, r0, #0 add r1, sp, #0 mov r0, r9 - bl func_01ff9c2c + bl Vec3p_Dot rsb r5, r0, #0 add r1, sp, #0x18 mov r0, r9 - bl func_01ff9c2c + bl Vec3p_Dot cmp r8, #0 strne r4, [r6] rsb r0, r0, #0 @@ -22579,7 +22579,7 @@ func_020104b8: ; 0x020104b8 ldr r2, [r5, #8] sub r2, r3, r2 str r2, [sp, #8] - bl func_01ff9d4c + bl Vec3p_Normalize ldr r0, [sp] strh r0, [r6, #0x50] ldr r0, [sp, #4] @@ -23536,7 +23536,7 @@ _02011304: add r0, sp, #0xc0 add r1, r8, #8 str r2, [sp, #0xc0] - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 bgt _0201136c ldr r0, [r8, #8] @@ -23595,7 +23595,7 @@ _020113e8: add r0, sp, #0xb4 add r1, r8, #8 str r2, [sp, #0xb4] - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 bge _02011450 ldr r0, [r8, #8] @@ -24054,7 +24054,7 @@ _020119d0: str r0, [sp, #0x38] add r0, sp, #0x30 add r1, sp, #0x3c - bl func_01ff9d4c + bl Vec3p_Normalize b _02011b54 _02011b20: ldr r0, [r8, #8] @@ -24070,7 +24070,7 @@ _02011b20: _02011b48: add r0, r8, #8 add r1, sp, #0x3c - bl func_01ff9d4c + bl Vec3p_Normalize _02011b54: ldr r0, [sp, #0x3c] ldr r3, [sp, #0xc] @@ -26335,7 +26335,7 @@ _020136d8: beq _02013760 add r1, sp, #0x60 add r0, r6, #0x14 - bl func_01ff9d4c + bl Vec3p_Normalize mov r0, #1 _02013760: cmp r0, #0 @@ -26353,7 +26353,7 @@ _02013770: beq _020137a0 add r1, sp, #0x60 add r0, r6, #8 - bl func_01ff9d4c + bl Vec3p_Normalize mov r0, #1 _020137a0: cmp r0, #0 @@ -26378,7 +26378,7 @@ _020137d0: ldr r3, [r8, #0x20] mov r2, r0 str r3, [sp, #0x5c] - bl func_01ff9c68 + bl Vec3p_Cross ldr r0, [sp, #0x60] cmp r0, #0 ldreq r0, [sp, #0x64] @@ -26389,7 +26389,7 @@ _020137d0: ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} add r0, sp, #0x60 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r1, sp, #0x30 mov r0, r8 bl func_020079d8 @@ -26407,7 +26407,7 @@ _020137d0: stmia r3, {r0, r1, r2} mov r0, r3 mov r1, r3 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r0, [r8, #0x20] ldr r1, [sp, #0x80] rsb r0, r0, #0 @@ -26536,7 +26536,7 @@ _020139d4: ldr r3, [r8, #0x20] mov r2, r9 str r3, [sp, #0x5c] - bl func_01ff9c68 + bl Vec3p_Cross ldr r0, [sp, #0x60] cmp r0, #0 ldreq r0, [sp, #0x64] @@ -26547,7 +26547,7 @@ _020139d4: ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} add r0, sp, #0x60 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r1, sp, #0x30 mov r0, r8 bl func_020079d8 @@ -26565,7 +26565,7 @@ _020139d4: stmia r3, {r0, r1, r2} mov r0, r3 mov r1, r3 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r0, [r8, #0x20] ldr r1, [sp, #0x80] rsb r0, r0, #0 @@ -26835,7 +26835,7 @@ _02013e5c: beq _02013ee8 add r1, sp, #0x60 add r0, r6, #0x14 - bl func_01ff9d4c + bl Vec3p_Normalize mov r0, #1 _02013ee8: cmp r0, #0 @@ -26853,7 +26853,7 @@ _02013ef8: beq _02013f28 add r1, sp, #0x60 add r0, r6, #8 - bl func_01ff9d4c + bl Vec3p_Normalize mov r0, #1 _02013f28: cmp r0, #0 @@ -26878,7 +26878,7 @@ _02013f58: ldr r3, [r8, #0x20] mov r2, r0 str r3, [sp, #0x5c] - bl func_01ff9c68 + bl Vec3p_Cross ldr r0, [sp, #0x60] cmp r0, #0 ldreq r0, [sp, #0x64] @@ -26889,7 +26889,7 @@ _02013f58: ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} add r0, sp, #0x60 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r1, sp, #0x30 mov r0, r8 bl func_020079d8 @@ -26907,7 +26907,7 @@ _02013f58: stmia r3, {r0, r1, r2} mov r0, r3 mov r1, r3 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r0, [r8, #0x20] ldr r1, [sp, #0x80] rsb r0, r0, #0 @@ -27036,7 +27036,7 @@ _0201415c: ldr r3, [r8, #0x20] mov r2, r9 str r3, [sp, #0x5c] - bl func_01ff9c68 + bl Vec3p_Cross ldr r0, [sp, #0x60] cmp r0, #0 ldreq r0, [sp, #0x64] @@ -27047,7 +27047,7 @@ _0201415c: ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} add r0, sp, #0x60 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r1, sp, #0x30 mov r0, r8 bl func_020079d8 @@ -27065,7 +27065,7 @@ _0201415c: stmia r3, {r0, r1, r2} mov r0, r3 mov r1, r3 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r0, [r8, #0x20] ldr r1, [sp, #0x80] rsb r0, r0, #0 @@ -27744,7 +27744,7 @@ func_02014b74: ; 0x02014b74 beq _02014c7c add r1, sp, #0x54 add r0, r5, #0x14 - bl func_01ff9d4c + bl Vec3p_Normalize mov r0, #1 _02014c7c: cmp r0, #0 @@ -27762,7 +27762,7 @@ _02014c8c: beq _02014cbc add r1, sp, #0x54 add r0, r5, #8 - bl func_01ff9d4c + bl Vec3p_Normalize mov r0, #1 _02014cbc: cmp r0, #0 @@ -27785,7 +27785,7 @@ _02014cec: str r3, [sp, #0x30] str r2, [sp, #0x34] str r3, [sp, #0x38] - bl func_01ff9c2c + bl Vec3p_Dot ldr r1, _02015060 ; =0x00000ccd cmp r0, r1 bgt _02014d24 @@ -27802,11 +27802,11 @@ _02014d38: add r0, sp, #0x54 add r1, sp, #0x30 add r2, sp, #0x48 - bl func_01ff9c68 + bl Vec3p_Cross add r0, sp, #0x54 add r1, sp, #0x48 add r2, sp, #0x3c - bl func_01ff9c68 + bl Vec3p_Cross ldr r1, [sp, #0x48] ldr r2, [sp, #0x4c] ldr r7, [sp, #0x50] @@ -28085,7 +28085,7 @@ func_02015074: ; 0x02015074 beq _02015180 add r1, sp, #0x54 add r0, r5, #0x14 - bl func_01ff9d4c + bl Vec3p_Normalize mov r0, #1 _02015180: cmp r0, #0 @@ -28103,7 +28103,7 @@ _02015190: beq _020151c0 add r1, sp, #0x54 add r0, r5, #8 - bl func_01ff9d4c + bl Vec3p_Normalize mov r0, #1 _020151c0: cmp r0, #0 @@ -28126,7 +28126,7 @@ _020151f0: str r3, [sp, #0x30] str r2, [sp, #0x34] str r3, [sp, #0x38] - bl func_01ff9c2c + bl Vec3p_Dot ldr r1, _02015564 ; =0x00000ccd cmp r0, r1 bgt _02015228 @@ -28143,11 +28143,11 @@ _0201523c: add r0, sp, #0x54 add r1, sp, #0x30 add r2, sp, #0x48 - bl func_01ff9c68 + bl Vec3p_Cross add r0, sp, #0x54 add r1, sp, #0x48 add r2, sp, #0x3c - bl func_01ff9c68 + bl Vec3p_Cross ldr r1, [sp, #0x48] ldr r2, [sp, #0x4c] ldr r7, [sp, #0x50] @@ -32623,7 +32623,7 @@ _02018118: add r0, r10, #0x28 add r1, r10, #0x34 add r2, r10, #0x40 - bl func_01ff9c68 + bl Vec3p_Cross ldr r0, [r10, #0x28] cmp r0, #0 ldreq r0, [r10, #0x2c] @@ -32639,7 +32639,7 @@ _02018118: _02018168: add r0, r10, #0x28 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize _02018174: ldr r0, [r10, #0x40] cmp r0, #0 @@ -32656,12 +32656,12 @@ _02018174: _020181a4: add r0, r10, #0x40 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize _020181b0: add r0, r10, #0x40 add r1, r10, #0x28 add r2, r10, #0x34 - bl func_01ff9c68 + bl Vec3p_Cross mov r0, #1 add sp, sp, #0x70 ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} @@ -35001,13 +35001,13 @@ _02019d8c: str r3, [r5] str r2, [r5, #4] str r1, [r5, #8] - bl func_01ff9cec + bl Vec3p_Length str r0, [r6] add r0, sp, #0x98 - bl func_01ff9cec + bl Vec3p_Length str r0, [r6, #4] add r0, sp, #0xa8 - bl func_01ff9cec + bl Vec3p_Length ldr r1, _02019f00 ; =data_027e037c str r0, [r6, #8] ldr r0, [r1, #0xfc] @@ -35214,13 +35214,13 @@ _0201a098: str r3, [r11] str r2, [r11, #4] str r1, [r11, #8] - bl func_01ff9cec + bl Vec3p_Length str r0, [r6] add r0, sp, #0x98 - bl func_01ff9cec + bl Vec3p_Length str r0, [r6, #4] add r0, sp, #0xa8 - bl func_01ff9cec + bl Vec3p_Length ldr r1, [sp, #0x9c] str r0, [r6, #8] cmp r1, #0 @@ -35229,7 +35229,7 @@ _0201a098: beq _0201a10c add r0, sp, #0x98 add r1, r7, #0xc - bl func_01ff9d4c + bl Vec3p_Normalize ldr r1, [r7, #0x14] ldr r0, [r7, #0x10] rsb r1, r1, #0 @@ -35239,7 +35239,7 @@ _0201a098: _0201a10c: add r0, sp, #0xa8 add r1, r7, #0x18 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r1, [r7, #0x1c] ldr r0, [r7, #0x20] rsb r1, r1, #0 @@ -38048,10 +38048,10 @@ _0201c728: mov r0, r5 mov r1, r5 str r2, [r5, #0x14] - bl func_01ff9d4c + bl Vec3p_Normalize add r0, r5, #0xc mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize cmp r10, #0 bne _0201c87c ldr r0, [r5, #0x18] @@ -38071,7 +38071,7 @@ _0201c728: add r0, r5, #0x18 mov r1, r0 str r2, [r5, #0x20] - bl func_01ff9d4c + bl Vec3p_Normalize add sp, sp, #0x48 ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc} _0201c87c: @@ -38145,10 +38145,10 @@ _0201c8e8: ldr r2, [sp, #0x14] add r2, r3, r2 str r2, [r5, #0x14] - bl func_01ff9d4c + bl Vec3p_Normalize add r0, r5, #0xc mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize cmp r8, #0 bne _0201c9e4 ldr r2, [r5, #0x18] @@ -38165,7 +38165,7 @@ _0201c8e8: ldr r2, [sp, #0x20] add r2, r3, r2 str r2, [r5, #0x20] - bl func_01ff9d4c + bl Vec3p_Normalize add sp, sp, #0x48 ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc} _0201c9e4: @@ -38386,10 +38386,10 @@ _0201cc28: mov r0, r10 mov r1, r10 str r2, [r10, #0x14] - bl func_01ff9d4c + bl Vec3p_Normalize add r0, r10, #0xc mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize cmp r5, #0 bne _0201cd90 ldr r2, [sp, #0x3c] @@ -38415,7 +38415,7 @@ _0201cc28: add r0, r10, #0x18 mov r1, r0 str r2, [r10, #0x20] - bl func_01ff9d4c + bl Vec3p_Normalize add sp, sp, #0x48 ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} _0201cd90: @@ -57338,7 +57338,7 @@ func_0202b03c: ; 0x0202b03c ldr r0, [sp, #0x28] add r2, sp, #0 mov r1, r8 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -57462,7 +57462,7 @@ func_0202b1d4: ; 0x0202b1d4 mov r4, r3 mov r0, r6 mov r1, r7 - bl func_01ff9bf8 + bl Vec3p_Sub cmp r4, #0 movne r0, #0 strne r0, [sp, #4] @@ -57477,7 +57477,7 @@ func_0202b1d4: ; 0x0202b1d4 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, pc} add r0, sp, #0 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r2, [sp] ldr r1, [sp, #4] smull ip, r3, r2, r5 @@ -57720,9 +57720,9 @@ _0202b54c: add r2, sp, #4 mov r0, r6 mov r1, r7 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #4 - bl func_01ff9cec + bl Vec3p_Length mov r1, r0 cmp r1, #0 addle sp, sp, #0x10 @@ -58047,11 +58047,11 @@ func_0202b8f8: ; 0x0202b8f8 mov r0, r9 add r1, sp, #0x50 add r2, sp, #0x38 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r9 add r1, sp, #0x44 add r2, sp, #0x2c - bl func_01ff9bc4 + bl Vec3p_Add mvn r0, #0 ldr r1, [sp, #0x38] str r0, [sp, #0x10] @@ -61305,7 +61305,7 @@ func_0202d95c: ; 0x0202d95c _0202da20: mov r0, r5 mov r1, r5 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r0, [r5] smull r2, r1, r0, r4 adds r2, r2, #0x800 @@ -61340,7 +61340,7 @@ func_0202da8c: ; 0x0202da8c mov r5, r0 mov r6, r1 mov r4, r2 - bl func_01ff9cec + bl Vec3p_Length mov r1, r0 cmp r1, r6 ble _0202db10 @@ -61388,7 +61388,7 @@ func_0202db30: ; 0x0202db30 mov r7, r1 mov r6, r2 mov r4, r3 - bl func_01ff9cec + bl Vec3p_Length mov r1, r0 cmp r1, r6 ble _0202dbb4 diff --git a/asm/main/main_0203e8a0.s b/asm/main/main_0203e8a0.s index e90e9770..224d807b 100644 --- a/asm/main/main_0203e8a0.s +++ b/asm/main/main_0203e8a0.s @@ -8710,13 +8710,13 @@ func_02042f68: ; 0x02042f68 bx lr arm_func_end func_02042f68 - .global func_02042f74 - arm_func_start func_02042f74 -func_02042f74: ; 0x02042f74 + .global abs + arm_func_start abs +abs: ; 0x02042f74 cmp r0, #0 rsblt r0, r0, #0 bx lr - arm_func_end func_02042f74 + arm_func_end abs .global func_02042f80 arm_func_start func_02042f80 diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc index 7fb31b6a..4b002127 100644 --- a/asm/ov00/Actor/Actor.inc +++ b/asm/ov00/Actor/Actor.inc @@ -34,9 +34,9 @@ .extern gActorManager .extern data_027e103c .extern data_ov00_020e9c88 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9cec +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Length .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffbe34 @@ -47,7 +47,7 @@ .extern func_0202b894 .extern func_0202d95c .extern func_020313c8 -.extern func_02042f74 +.extern abs .extern func_ov00_02079470 .extern func_ov00_0207a188 .extern func_ov00_0207a1c8 diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s index 9c233ab0..7807db83 100644 --- a/asm/ov00/Actor/Actor.s +++ b/asm/ov00/Actor/Actor.s @@ -750,7 +750,7 @@ _ZN5Actor10IsNearLinkEv: ; 0x020c1c94 ldr r1, [sp] ldr r0, [r4, #0x48] sub r0, r1, r0 - bl func_02042f74 + bl abs cmp r0, #0xa000 addgt sp, sp, #0xc movgt r0, #0 @@ -758,7 +758,7 @@ _ZN5Actor10IsNearLinkEv: ; 0x020c1c94 ldr r1, [sp, #8] ldr r0, [r4, #0x50] sub r0, r1, r0 - bl func_02042f74 + bl abs cmp r0, #0xa000 movle r0, #1 movgt r0, #0 @@ -849,7 +849,7 @@ _020c1dec: ldr r0, _020c1e24 ; =gPlayerPos add r2, sp, #0 add r1, r6, #0x54 - bl func_01ff9bf8 + bl Vec3p_Sub _020c1dfc: ldr r0, _020c1e28 ; =gPlayer ldrb r1, [r6, #0x124] @@ -897,7 +897,7 @@ _020c1e8c: ldr r0, _020c1ef0 ; =gPlayerPos add r2, sp, #0x10 add r1, r5, #0x54 - bl func_01ff9bf8 + bl Vec3p_Sub _020c1e9c: add r1, sp, #0 mov r0, r5 @@ -1010,7 +1010,7 @@ _ZN5Actor18func_ov00_020c1fc8Ej: ; 0x020c1fc8 ldr r1, _020c2228 ; =gPlayerPos add r2, sp, #0x60 add r0, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r4 and r1, r6, #2 bl _ZN5Actor18CollidesWithPlayerEj @@ -1164,7 +1164,7 @@ _ZN5Actor18CollidesWithShieldEP8Cylinder: ; 0x020c2238 ldr r1, _020c22ac ; =gPlayerPos add r2, sp, #0 add r0, r0, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _020c22b0 ; =data_027e0fac ldr r0, [sp] ldrsh r4, [r1] @@ -1372,7 +1372,7 @@ _020c2508: add r2, sp, #4 add r0, r7, #0x48 add r1, r5, #0x54 - bl func_01ff9bf8 + bl Vec3p_Sub _020c2518: ldrb r0, [r5, #0x125] ldr r1, _020c2704 ; =0x43424c53 @@ -1786,7 +1786,7 @@ _ZN5Actor18func_ov00_020c29ecEi: ; 0x020c29ec stmdb sp!, {r4, lr} add r0, r0, #0x148 mov r4, r1 - bl func_01ff9cec + bl Vec3p_Length cmp r0, r4 movgt r0, #1 movle r0, #0 @@ -1983,9 +1983,9 @@ _ZN5Actor18func_ov00_020c2c70Ev: ; 0x020c2c70 add r2, sp, #0xc add r0, r4, #0x48 add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0xc - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x1000 ble _020c2d00 add r0, sp, #0xc @@ -2004,18 +2004,18 @@ _020c2cbc: add r0, sp, #0 add r2, sp, #0xc add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub b _020c2d00 _020c2cf0: ldr r0, _020c2d40 ; =gPlayerPos add r2, sp, #0xc add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub _020c2d00: add r0, r5, #0x48 add r1, sp, #0xc mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0xc] cmp r4, #0 str r0, [r5, #0x60] @@ -2098,9 +2098,9 @@ _ZN5Actor18func_ov00_020c2de4Ev: ; 0x020c2de4 beq _020c2e30 add r0, r4, #0x48 add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x1000 ble _020c2e3c add r0, sp, #0 @@ -2110,12 +2110,12 @@ _ZN5Actor18func_ov00_020c2de4Ev: ; 0x020c2de4 _020c2e30: ldr r0, _020c2e78 ; =gPlayerPos add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub _020c2e3c: add r0, r5, #0x48 add r1, sp, #0 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp] cmp r4, #0 str r0, [r5, #0x60] @@ -2198,7 +2198,7 @@ _ZN5Actor18func_ov00_020c2ed4Ev: ; 0x020c2ed4 ldr r3, [sp, #0x18] mov r2, r0 str r3, [r4, #0x68] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 mov r1, #1 bl func_01fffd04 diff --git a/asm/ov00/Map/MapManager.inc b/asm/ov00/Map/MapManager.inc index 9d0465e8..dcc9b89f 100644 --- a/asm/ov00/Map/MapManager.inc +++ b/asm/ov00/Map/MapManager.inc @@ -59,11 +59,11 @@ .extern data_ov00_020e24a4 .extern data_ov00_020eec68 .extern data_ov15_02190458 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9cec -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Length +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffbe78 .extern func_01ffe61c diff --git a/asm/ov00/Map/MapManager.s b/asm/ov00/Map/MapManager.s index 6c40ea1d..4328e994 100644 --- a/asm/ov00/Map/MapManager.s +++ b/asm/ov00/Map/MapManager.s @@ -2352,7 +2352,7 @@ _02083ab4: ldr r3, [r5, #8] add r2, sp, #0xc str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r6, #4] ldr r1, [sp, #0x14] bl _ZN7MapBase15GetClampedTileYEi @@ -2802,11 +2802,11 @@ _ZN10MapManager18func_ov00_02084024EiP4AABB: ; 0x02084024 mov r0, r5 mov r2, r5 str r4, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add add r0, r5, #0xc mov r2, r0 add r1, sp, #0 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, pc} arm_func_end _ZN10MapManager18func_ov00_02084024EiP4AABB @@ -3075,7 +3075,7 @@ _ZN10MapManager18func_ov00_0208433cEP5Vec3pi: ; 0x0208433c add r0, sp, #0x10 add r1, sp, #4 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [r5, #4] add r0, sp, #0 add r2, sp, #0x10 @@ -3103,7 +3103,7 @@ _ZN10MapManager18func_ov00_0208439cEv: ; 0x0208439c add r1, sp, #0 mov r0, r4 mov r2, r4 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 mov r1, r4 mov r2, #1 @@ -3988,7 +3988,7 @@ _02084de4: add r1, sp, #0x2c mov r0, r3 mov r2, r3 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, _02084ea8 ; =data_ov00_020e2510 add r1, sp, #0x2c add r2, sp, #0x14 @@ -4008,7 +4008,7 @@ _02084de4: mov r3, r4 str r0, [r4, #8] ldr r0, [sp, #4] - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, [sp, #4] cmp r0, #0 addge sp, sp, #0x38 @@ -4024,7 +4024,7 @@ _02084de4: mov r2, r4 mov r3, r4 str ip, [r4, #8] - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, #1 add sp, sp, #0x38 ldmia sp!, {r4, pc} @@ -5063,7 +5063,7 @@ _ZN10MapManager18func_ov00_02085c60Eiiii: ; 0x02085c60 mov r1, r4 mov r0, r3 mov r2, r3 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0xc000 mov r2, #0 umull r5, r3, r11, r1 @@ -5075,12 +5075,12 @@ _ZN10MapManager18func_ov00_02085c60Eiiii: ; 0x02085c60 mov r5, r2, lsr #0xc add r0, sp, #0x58 orr r5, r5, r1, lsl #20 - bl func_01ff9cec + bl Vec3p_Length cmp r0, r5 ble _02085d9c add r0, sp, #0x58 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, sp, #0x58 mov r1, r5 bl func_01fffbec @@ -5093,7 +5093,7 @@ _ZN10MapManager18func_ov00_02085c60Eiiii: ; 0x02085c60 str r1, [sp, #0x90] add r1, sp, #0x58 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0x8c] ldr r1, [sp, #0x88] str r0, [sp, #0x74] @@ -5110,7 +5110,7 @@ _02085d9c: str ip, [sp, #0x58] str r5, [sp, #0x5c] str r3, [sp, #0x60] - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, r4, lsl #0xb mov r0, #0x800 adds r2, r0, r11, lsl #11 @@ -5119,12 +5119,12 @@ _02085d9c: adc r1, r1, #0 mov r5, r2, lsr #0xc orr r5, r5, r1, lsl #20 - bl func_01ff9cec + bl Vec3p_Length cmp r0, r11 blt _02085e30 add r0, sp, #0x58 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, sp, #0x58 mov r1, r5 bl func_01fffbec @@ -5137,7 +5137,7 @@ _02085d9c: str r2, [sp, #0x78] add r1, sp, #0x58 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add _02085e30: mov r4, #0 mov r0, r11, lsl #0x1 @@ -5173,14 +5173,14 @@ _02085e48: str r2, [sp, #0x34] ldr r2, [r9, #0x14] str r2, [sp, #0x38] - bl func_01ff9d4c + bl Vec3p_Normalize add r0, sp, #0x30 mov r1, r11 bl func_01fffbec add r0, sp, #0x3c add r1, sp, #0x30 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #0x3c] ldr r2, _02086040 ; =0x0000ffff str r1, [r9] @@ -5332,7 +5332,7 @@ _ZN10MapManager18func_ov00_02086044Eiii: ; 0x02086044 mov r0, r4 mov r1, r3 add r2, sp, #0x80 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [r9] mov r0, r10 bl _ZN10MapManager18func_ov00_020839d4Ev @@ -5372,7 +5372,7 @@ _02086164: ldr r0, [sp] mov r1, r9 add r2, sp, #0x5c - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [r9] add r0, sp, #0x68 str r1, [sp, #0x28] @@ -5475,7 +5475,7 @@ _020862d0: sub r6, r2, r0 mov r0, r8 mov r2, r1 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x140 bl func_01fffb4c cmp r0, #0 @@ -5492,7 +5492,7 @@ _02086340: add r1, sp, #0x140 mov r0, r8 mov r2, r5 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x14c add r3, sp, #0x128 ldmia r0, {r0, r1, r2} @@ -5500,7 +5500,7 @@ _02086340: add r2, sp, #0x134 mov r0, r7 mov r1, r3 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x134 bl func_01fffb4c ldr r1, [sp, #0x134] @@ -5570,7 +5570,7 @@ _02086464: sub r6, r2, r0 mov r0, r8 mov r2, r1 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x108 bl func_01fffb4c cmp r0, #0 @@ -5587,7 +5587,7 @@ _020864b0: add r1, sp, #0x108 mov r0, r8 mov r2, r5 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x114 add r3, sp, #0xf0 ldmia r0, {r0, r1, r2} @@ -5597,7 +5597,7 @@ _020864b0: str r0, [sp, #0xf4] mov r0, r7 mov r1, r3 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0xfc bl func_01fffb4c ldr r1, [sp, #0xfc] @@ -5627,7 +5627,7 @@ _02086520: str r2, [sp, #0xc8] mov r0, r8 mov r2, r1 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0xc0 add r3, sp, #0xb4 ldmia r0, {r0, r1, r2} @@ -5990,7 +5990,7 @@ _ZN10MapManager18func_ov00_02086a84EPiP5Vec3pS2_iiiS2_S2_: ; 0x02086a84 ldr r6, [sp, #0xa4] ldr r5, [sp, #0xac] ldr r4, [sp, #0xb0] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r9 ldr r1, [r0] ldr r1, [r1, #8] @@ -6024,7 +6024,7 @@ _02086ae0: sub r6, r2, r0 add r2, sp, #0x5c mov r0, r8 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x5c bl func_01fffb4c cmp r0, #0 @@ -6041,7 +6041,7 @@ _02086b5c: add r1, sp, #0x5c mov r0, r8 mov r2, r5 - bl func_01ff9bc4 + bl Vec3p_Add b _02086b98 _02086b7c: add r0, sp, #0x78 @@ -6050,7 +6050,7 @@ _02086b7c: add r1, sp, #0x78 mov r0, r7 mov r2, r5 - bl func_01ff9bc4 + bl Vec3p_Add _02086b98: add r0, sp, #0x68 add r3, sp, #0x44 @@ -6059,7 +6059,7 @@ _02086b98: add r2, sp, #0x50 mov r0, r7 mov r1, r3 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x50 bl func_01fffb4c ldr r1, [sp, #0x50] @@ -6088,7 +6088,7 @@ _02086be4: add r1, sp, #0x78 mov r0, r7 mov r2, r5 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x30 add r3, sp, #0x24 ldmia r0, {r0, r1, r2} @@ -6098,7 +6098,7 @@ _02086be4: str r2, [sp, #0x28] mov r0, r7 mov r2, r4 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r4 bl func_01fffb4c add sp, sp, #0x84 @@ -6119,11 +6119,11 @@ _02086c64: add r1, sp, #0x78 mov r2, r5 mov r0, r7 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r7 add r1, sp, #0 mov r2, r4 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r4 bl func_01fffb4c add sp, sp, #0x84 diff --git a/asm/ov00/Player/LinkStateBase.inc b/asm/ov00/Player/LinkStateBase.inc index b9fa8130..0546f6e4 100644 --- a/asm/ov00/Player/LinkStateBase.inc +++ b/asm/ov00/Player/LinkStateBase.inc @@ -23,7 +23,7 @@ .extern data_027e0fd4 .extern gActorManager .extern data_027e0fe8 -.extern func_01ff9bf8 +.extern Vec3p_Sub .extern func_01ffa0f4 .extern func_01ffe468 .extern func_01fffcd8 diff --git a/asm/ov00/Player/LinkStateBase.s b/asm/ov00/Player/LinkStateBase.s index f4a787a6..d4bebb0f 100644 --- a/asm/ov00/Player/LinkStateBase.s +++ b/asm/ov00/Player/LinkStateBase.s @@ -754,7 +754,7 @@ _ZN13LinkStateBase18func_ov00_020a8774EP5Vec3pi: ; 0x020a8774 mov r1, r0 add r2, sp, #0 mov r0, r5 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r6 bl _ZN13LinkStateBase18func_ov00_020a8d40Ev mov r1, r4, lsl #0x10 diff --git a/asm/ov00/Player/LinkStateDamage.inc b/asm/ov00/Player/LinkStateDamage.inc index af8e46c7..65cd416a 100644 --- a/asm/ov00/Player/LinkStateDamage.inc +++ b/asm/ov00/Player/LinkStateDamage.inc @@ -42,7 +42,7 @@ .extern data_ov00_020e9c88 .extern data_ov00_020eec68 .extern data_ov00_020eec9c -.extern func_01ff9bc4 +.extern Vec3p_Add .extern func_01ffa0f4 .extern func_02019534 .extern func_0201e388 diff --git a/asm/ov00/Player/LinkStateDamage.s b/asm/ov00/Player/LinkStateDamage.s index 45791979..7561856a 100644 --- a/asm/ov00/Player/LinkStateDamage.s +++ b/asm/ov00/Player/LinkStateDamage.s @@ -428,7 +428,7 @@ _020ac400: bl _ZN13LinkStateBase12GetPlayerPosEv add r1, r5, #0x34 add r2, sp, #8 - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #8 str r1, [sp] mov r0, #1 @@ -861,7 +861,7 @@ _ZN15LinkStateDamage18func_ov00_020aca50Ev: ; 0x020aca50 bl _ZN13LinkStateBase12GetPlayerPosEv add r2, sp, #0 add r1, r4, #0x1c - bl func_01ff9bc4 + bl Vec3p_Add add r0, r5, #0x3c ldr r2, [r0] add r1, sp, #0 @@ -1141,7 +1141,7 @@ _020ace44: mov r2, r0 add r1, sp, #0 mov r0, r4 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 diff --git a/asm/ov00/Player/LinkStateFollow.inc b/asm/ov00/Player/LinkStateFollow.inc index c5775e7b..c2599fcb 100644 --- a/asm/ov00/Player/LinkStateFollow.inc +++ b/asm/ov00/Player/LinkStateFollow.inc @@ -12,8 +12,8 @@ .extern _ZN13PlayerControl18func_ov00_020af01cEPc .extern gMapManager .extern data_027e0fb8 -.extern func_01ff9bf8 -.extern func_01ff9cec +.extern Vec3p_Sub +.extern Vec3p_Length .extern func_01fffcd8 .extern func_0202b308 .extern func_0202d95c diff --git a/asm/ov00/Player/LinkStateFollow.s b/asm/ov00/Player/LinkStateFollow.s index bf598b3c..a4ff49e4 100644 --- a/asm/ov00/Player/LinkStateFollow.s +++ b/asm/ov00/Player/LinkStateFollow.s @@ -42,11 +42,11 @@ _ZN15LinkStateFollow16MoveTowardTargetEv: ; 0x020a8f80 mov r1, r0 add r2, sp, #0 add r0, r4, #0x18 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0 str r1, [sp, #4] - bl func_01ff9cec + bl Vec3p_Length ldr r1, _020a9024 ; =0x00000155 cmp r0, r1 addlt sp, sp, #0xc diff --git a/asm/ov00/Player/LinkStateInteract.inc b/asm/ov00/Player/LinkStateInteract.inc index 7110e56a..05cc6433 100644 --- a/asm/ov00/Player/LinkStateInteract.inc +++ b/asm/ov00/Player/LinkStateInteract.inc @@ -47,10 +47,10 @@ .extern data_027e0fb8 .extern gActorManager .extern data_ov00_020eec9c -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9cec -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Length +.extern Vec3p_Axpy .extern func_01ffa0f4 .extern func_01ffbe78 .extern func_01fffcd8 diff --git a/asm/ov00/Player/LinkStateInteract.s b/asm/ov00/Player/LinkStateInteract.s index a6804fe7..5d2bf5fc 100644 --- a/asm/ov00/Player/LinkStateInteract.s +++ b/asm/ov00/Player/LinkStateInteract.s @@ -491,7 +491,7 @@ _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor: ; 0x020aa844 mov r1, r0 add r2, sp, #0x20 add r0, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r5 bl _ZN13LinkStateBase14GetPlayerAngleEv ldrh r6, [r0] @@ -918,7 +918,7 @@ _020aae90: add r1, r6, #0x60 add r2, r6, #0x48 mov r0, #0x6000 - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, #0 ldr r1, _020ab3d4 ; =0x0000ffff strh r0, [sp, #0x94] @@ -976,7 +976,7 @@ _020aaf88: mov r1, r0 add r0, sp, #0x5c add r2, sp, #0x50 - bl func_01ff9bf8 + bl Vec3p_Sub add r1, sp, #0x40 mov r0, r6 bl _ZN5Actor9GetHitboxEP8Cylinder @@ -994,7 +994,7 @@ _020aafbc: ; jump table b _020ab398 ; case 6 _020aafd8: add r0, sp, #0x50 - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x800 bge _020aaff4 ldr r0, _020ab3cc ; =data_027e0fb8 @@ -1031,7 +1031,7 @@ _020ab000: ldmia sp!, {r4, r5, r6, r7, r8, pc} _020ab060: add r0, sp, #0x50 - bl func_01ff9cec + bl Vec3p_Length ldr r1, [sp, #0x4c] mov r5, r0 add r0, r1, #0x3800 @@ -1105,7 +1105,7 @@ _020ab160: b _020ab1d8 _020ab170: add r0, sp, #0x50 - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x4000 bge _020ab1d8 mov r0, r4 @@ -1113,7 +1113,7 @@ _020ab170: mov r1, r0 add r0, r6, #0x48 add r2, r4, #0x18 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, _020ab3cc ; =data_027e0fb8 mov r1, #0 ldr r2, [r0] @@ -1136,7 +1136,7 @@ _020ab1d8: ldmia sp!, {r4, r5, r6, r7, r8, pc} _020ab1e4: add r0, sp, #0x50 - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x400 bge _020ab2a4 mov r0, r4 @@ -1144,7 +1144,7 @@ _020ab1e4: mov r1, r0 add r0, sp, #0x40 add r2, sp, #0x34 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x34] cmp r0, #0 ldreq r0, [sp, #0x3c] @@ -1190,7 +1190,7 @@ _020ab2a4: ldmia sp!, {r4, r5, r6, r7, r8, pc} _020ab2b0: add r0, sp, #0x50 - bl func_01ff9cec + bl Vec3p_Length ldr r1, [sp, #0x4c] add r1, r1, #0xc00 cmp r0, r1 @@ -1615,7 +1615,7 @@ _020ab818: bl _ZN13LinkStateBase12GetPlayerPosEv add r2, sp, #0x10 mov r1, r5 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp, #0xc] ldr r0, [sp, #0x10] add r2, r1, #0x66 @@ -1672,7 +1672,7 @@ _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p: ; 0x020ab8cc mov r1, r0 mov r0, r4 add r2, r5, #0x18 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r5, #0x18 mov r2, r0 mov r1, #0x1000 @@ -1692,7 +1692,7 @@ _ZN17LinkStateInteract14SetThrowOffsetEP5Vec3p: ; 0x020ab908 mov r1, r0 mov r0, r4 add r2, r5, #0x18 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #3 str r0, [r5, #4] ldmia sp!, {r3, r4, r5, pc} @@ -1712,7 +1712,7 @@ _ZN17LinkStateInteract18func_ov00_020ab934EP5Vec3p: ; 0x020ab934 mov r1, r0 mov r0, r4 add r2, r5, #0x18 - bl func_01ff9bf8 + bl Vec3p_Sub mov r2, #3 mov r0, r5 mov r1, #2 @@ -1735,7 +1735,7 @@ _ZN17LinkStateInteract18func_ov00_020ab97cEP5Vec3p: ; 0x020ab97c mov r1, r0 mov r0, r4 add r2, r5, #0x18 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #4 str r0, [r5, #4] ldmia sp!, {r3, r4, r5, pc} @@ -1765,7 +1765,7 @@ _ZN17LinkStateInteract18func_ov00_020ab9b8Ejb: ; 0x020ab9b8 bl _ZN13LinkStateBase12GetPlayerPosEv add r2, sp, #0xc add r1, r7, #0x18 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4, #4] ldr r0, _020abb64 ; =0x424b4559 cmp r1, r0 diff --git a/asm/ov00/Player/PlayerBase.inc b/asm/ov00/Player/PlayerBase.inc index ef5879ce..c3463165 100644 --- a/asm/ov00/Player/PlayerBase.inc +++ b/asm/ov00/Player/PlayerBase.inc @@ -15,7 +15,7 @@ .extern data_027e0fb0 .extern data_027e0fb8 .extern gActorManager -.extern func_01ff9bf8 +.extern Vec3p_Sub .extern func_01ffa0f4 .extern func_01ffec34 .extern func_01fffcec diff --git a/asm/ov00/Player/PlayerBase.s b/asm/ov00/Player/PlayerBase.s index 718ea765..95f37637 100644 --- a/asm/ov00/Player/PlayerBase.s +++ b/asm/ov00/Player/PlayerBase.s @@ -96,7 +96,7 @@ _ZN10PlayerBase6LookAtEP5Vec3p: ; 0x020a7bac mov r0, r1 ldr r1, _020a7bf8 ; =gPlayerPos add r2, sp, #0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] cmp r0, #0 ldreq r0, [sp, #8] diff --git a/asm/ov00/Player/PlayerControl.inc b/asm/ov00/Player/PlayerControl.inc index c2f48f3b..07f29057 100644 --- a/asm/ov00/Player/PlayerControl.inc +++ b/asm/ov00/Player/PlayerControl.inc @@ -41,10 +41,10 @@ .extern func_01ff991c .extern func_01ff992c .extern func_01ff9958 -.extern func_01ff9bf8 -.extern func_01ff9c2c -.extern func_01ff9cec -.extern func_01ff9e64 +.extern Vec3p_Sub +.extern Vec3p_Dot +.extern Vec3p_Length +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffe468 diff --git a/asm/ov00/Player/PlayerControl.s b/asm/ov00/Player/PlayerControl.s index b8b254e2..7ed2a28a 100644 --- a/asm/ov00/Player/PlayerControl.s +++ b/asm/ov00/Player/PlayerControl.s @@ -1376,7 +1376,7 @@ _ZN13PlayerControl18func_ov00_020affecEP5Vec3piiS1_: ; 0x020affec add r3, sp, #0x24 add r1, r7, #0x44 add r2, r7, #0x38 - bl func_01ff9e64 + bl Vec3p_Axpy add r0, sp, #0x18 mov r1, #0 str r1, [r0] @@ -1390,7 +1390,7 @@ _ZN13PlayerControl18func_ov00_020affecEP5Vec3piiS1_: ; 0x020affec ldr r2, [r4, #8] sub r1, r2, r1 str r1, [sp, #0x20] - bl func_01ff9cec + bl Vec3p_Length cmp r0, r5 bgt _020b008c ldr r0, [sp, #0x24] @@ -1411,7 +1411,7 @@ _020b008c: str r1, [sp, #0xc] ldr r1, [r7, #0x4c] str r1, [sp, #0x14] - bl func_01ff9cec + bl Vec3p_Length bl func_01ff991c mov r4, r0 ldr r1, [sp, #0xc] @@ -1430,7 +1430,7 @@ _020b008c: add r0, sp, #0x18 add r1, sp, #0xc str r3, [sp, #0xc] - bl func_01ff9c2c + bl Vec3p_Dot mov r3, r6 mov r7, r0 add r0, sp, #0xc @@ -1441,7 +1441,7 @@ _020b008c: mov r1, r6 add r2, sp, #0x24 str r4, [sp, #4] - bl func_01ff9e64 + bl Vec3p_Axpy add sp, sp, #0x30 ldmia sp!, {r3, r4, r5, r6, r7, pc} _020b0134: @@ -1729,9 +1729,9 @@ _ZN13PlayerControl18func_ov00_020b049cEP5Vec3pb: ; 0x020b049c ldr r1, _020b05d8 ; =gPlayerPos mov r0, r4 mov r2, r4 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r4 - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x1400 movge r0, #1 ldmgeia sp!, {r3, r4, r5, r6, r7, pc} @@ -1890,7 +1890,7 @@ _020b06e0: add r0, sp, #4 mov r2, r5 str r3, [sp, #0xc] - bl func_01ff9bf8 + bl Vec3p_Sub add sp, sp, #0x10 mov r0, #1 ldmia sp!, {r4, r5, r6, pc} @@ -2245,7 +2245,7 @@ _020b0bf8: str r2, [sp, #0x18] str r1, [sp, #0x1c] str r3, [sp, #0x20] - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0xa000 addlt sp, sp, #0x24 movlt r0, #0 @@ -2320,7 +2320,7 @@ _020b0cd8: mov r4, r3, asr #0x10 mov r3, ip, lsl #0xc str r3, [sp, #4] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r7, #0x58] cmp r0, #0xa000 bgt _020b0d7c @@ -2419,7 +2419,7 @@ _ZN13PlayerControl18func_ov00_020b0e54EP5Vec3pS1_: ; 0x020b0e54 mov r2, #0x800 bl func_ov00_020b7d4c add r0, sp, #0 - bl func_01ff9cec + bl Vec3p_Length mov r5, r0 cmp r5, #0x4000 ble _020b0ed0 @@ -2505,7 +2505,7 @@ _ZN13PlayerControl18func_ov00_020b0f88EP5Vec3piS1_: ; 0x020b0f88 mov r2, r6 bl func_ov00_020b7d4c add r0, sp, #0 - bl func_01ff9cec + bl Vec3p_Length mov r6, r0 cmp r6, #0x4000 ble _020b0ffc @@ -2568,7 +2568,7 @@ _ZN13PlayerControl18func_ov00_020b1058EP5Vec3piS1_S1_: ; 0x020b1058 beq _020b1140 ldr r1, _020b11d8 ; =gPlayerPos add r2, sp, #0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr ip, [sp] ldr r3, [sp, #4] mov r2, ip, asr #0x1f @@ -2609,7 +2609,7 @@ _ZN13PlayerControl18func_ov00_020b1058EP5Vec3piS1_S1_: ; 0x020b1058 str r0, [sp, #0x14] _020b1140: add r0, sp, #0xc - bl func_01ff9cec + bl Vec3p_Length mov r6, r0 cmp r6, #0x4000 ble _020b117c diff --git a/asm/ov00/ov00_020773c0.inc b/asm/ov00/ov00_020773c0.inc index e016ee5b..9295429a 100644 --- a/asm/ov00/ov00_020773c0.inc +++ b/asm/ov00/ov00_020773c0.inc @@ -42,7 +42,7 @@ .extern data_ov00_020ec718 .extern data_ov00_020ec7dc .extern func_01ff9b4c -.extern func_01ff9bc4 +.extern Vec3p_Add .extern func_02000b60 .extern func_02002bac .extern func_02002bf4 diff --git a/asm/ov00/ov00_020773c0.s b/asm/ov00/ov00_020773c0.s index 4df79e2b..e40d5540 100644 --- a/asm/ov00/ov00_020773c0.s +++ b/asm/ov00/ov00_020773c0.s @@ -5675,7 +5675,7 @@ func_ov00_0207a1c8: ; 0x0207a1c8 add r2, sp, #0 add r0, r5, #4 str r3, [sp, #0xc] - bl func_01ff9bc4 + bl Vec3p_Add _0207a1f8: ldr r0, _0207a28c ; =data_027e0c54 mov r2, #1 diff --git a/asm/ov00/ov00_02086cd0.inc b/asm/ov00/ov00_02086cd0.inc index d1d24414..9c6118f4 100644 --- a/asm/ov00/ov00_02086cd0.inc +++ b/asm/ov00/ov00_02086cd0.inc @@ -163,12 +163,12 @@ .extern func_01ff9958 .extern func_01ff99f4 .extern func_01ff9a50 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c2c -.extern func_01ff9c68 -.extern func_01ff9cec -.extern func_01ff9d4c +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Dot +.extern Vec3p_Cross +.extern Vec3p_Length +.extern Vec3p_Normalize .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffa8d4 diff --git a/asm/ov00/ov00_02086cd0.s b/asm/ov00/ov00_02086cd0.s index 725f3102..09de3872 100644 --- a/asm/ov00/ov00_02086cd0.s +++ b/asm/ov00/ov00_02086cd0.s @@ -1521,7 +1521,7 @@ func_ov00_02088074: ; 0x02088074 _020880ac: mov r0, r6 mov r1, r4 - bl func_01ff9c2c + bl Vec3p_Dot add r1, r8, r5, lsl #4 ldr r2, [r1, #0x118] ldr r1, [r7, #0xc] @@ -2704,11 +2704,11 @@ _020890ec: add r0, sp, #0x34 add r1, sp, #0xc add r2, sp, #0x24 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x40 add r1, sp, #0xc add r2, sp, #0x18 - bl func_01ff9bc4 + bl Vec3p_Add b _0208912c _02089120: add sp, sp, #0x4c @@ -3541,7 +3541,7 @@ func_ov00_02089b94: ; 0x02089b94 str r6, [sp] str lr, [sp, #4] str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} .align 2, 0 @@ -3594,7 +3594,7 @@ func_ov00_02089c50: ; 0x02089c50 str r6, [sp] str lr, [sp, #4] str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} .align 2, 0 @@ -3993,11 +3993,11 @@ _0208a2cc: add r0, r4, #0x260 add r1, sp, #4 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x26c add r1, sp, #4 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 @@ -4999,7 +4999,7 @@ _0208af04: add r1, sp, #0x20 mov r0, r3 mov r2, r3 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] bl func_01ffa0f4 @@ -5800,7 +5800,7 @@ func_ov00_0208b930: ; 0x0208b930 add r2, sp, #0xc add r1, ip, #0x18 str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] bl func_01ffa0f4 @@ -5828,7 +5828,7 @@ func_ov00_0208b988: ; 0x0208b988 add r0, sp, #0 add r1, ip, #0x18 str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub add sp, sp, #0xc ldmia sp!, {pc} .align 2, 0 @@ -9212,7 +9212,7 @@ func_ov00_0208e514: ; 0x0208e514 mov r0, #0xc mla r1, r2, r0, r1 add r0, r4, #8 - bl func_01ff9c2c + bl Vec3p_Dot str r0, [r4, #0x14] ldr r0, [r4, #0x48] ldrh r3, [r4, #2] @@ -9222,11 +9222,11 @@ func_ov00_0208e514: ; 0x0208e514 mla r0, r3, r1, ip mla r1, r2, r1, ip add r2, r4, #0x18 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r4, #0x18 add r1, r4, #8 mov r2, r0 - bl func_01ff9c68 + bl Vec3p_Cross add r0, r4, #0x18 bl func_01fffb4c ldr r1, [r4, #0x48] @@ -9235,7 +9235,7 @@ func_ov00_0208e514: ; 0x0208e514 mov r1, #0xc mla r1, r2, r1, r3 add r0, r4, #0x18 - bl func_01ff9c2c + bl Vec3p_Dot str r0, [r4, #0x24] ldr r0, [r4, #0x48] ldrh r2, [r4, #4] @@ -9245,11 +9245,11 @@ func_ov00_0208e514: ; 0x0208e514 mla r0, r2, r1, ip mla r1, r3, r1, ip add r2, r4, #0x28 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r4, #0x28 add r1, r4, #8 mov r2, r0 - bl func_01ff9c68 + bl Vec3p_Cross add r0, r4, #0x28 bl func_01fffb4c ldr r1, [r4, #0x48] @@ -9258,7 +9258,7 @@ func_ov00_0208e514: ; 0x0208e514 mov r1, #0xc mla r1, r2, r1, r3 add r0, r4, #0x28 - bl func_01ff9c2c + bl Vec3p_Dot str r0, [r4, #0x34] ldr r0, [r4, #0x48] ldrh r3, [r4] @@ -9268,11 +9268,11 @@ func_ov00_0208e514: ; 0x0208e514 mla r0, r3, r1, ip mla r1, r2, r1, ip add r2, r4, #0x38 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r4, #0x38 add r1, r4, #8 mov r2, r0 - bl func_01ff9c68 + bl Vec3p_Cross add r0, r4, #0x38 bl func_01fffb4c ldr r0, [r4, #0x48] @@ -9281,7 +9281,7 @@ func_ov00_0208e514: ; 0x0208e514 mov r0, #0xc mla r1, r2, r0, r1 add r0, r4, #0x38 - bl func_01ff9c2c + bl Vec3p_Dot str r0, [r4, #0x44] ldmia sp!, {r4, pc} arm_func_end func_ov00_0208e514 @@ -9450,11 +9450,11 @@ func_ov00_0208e82c: ; 0x0208e82c str r3, [sp, #0x18] str r3, [sp, #0x1c] str r3, [sp, #0x20] - bl func_01ff9bf8 + bl Vec3p_Sub add r1, sp, #0x18 add r2, sp, #0xc add r0, r5, #0xc - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0 mov r1, r4 bl func_ov00_0208e72c @@ -9488,7 +9488,7 @@ func_ov00_0208e87c: ; 0x0208e87c str r0, [sp, #0x44] add r1, sp, #0x3c mov r0, r5 - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 ble _0208e984 ldr r2, [sp, #0x5c] @@ -9539,7 +9539,7 @@ _0208e984: str r3, [sp, #0x30] str r3, [sp, #0x34] str r2, [sp, #0x38] - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 ble _0208ea4c ldr r2, [sp, #0x50] @@ -9591,7 +9591,7 @@ _0208ea4c: str r3, [sp, #0x24] str r2, [sp, #0x28] str r2, [sp, #0x2c] - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 ble _0208eb14 ldr r2, [sp, #0x54] @@ -9641,7 +9641,7 @@ _0208eb14: str r3, [sp, #0x18] str r2, [sp, #0x1c] str r2, [sp, #0x20] - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 ble _0208ebd8 ldr r2, [sp, #0x48] @@ -9691,7 +9691,7 @@ _0208ebd8: str r3, [sp, #0xc] str r2, [sp, #0x10] str r3, [sp, #0x14] - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 ble _0208eca0 ldr r2, [sp, #0x58] @@ -9742,7 +9742,7 @@ _0208eca0: str r3, [sp] str r2, [sp, #4] str r3, [sp, #8] - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 ble _0208ed68 ldr r2, [sp, #0x4c] @@ -9828,11 +9828,11 @@ func_ov00_0208edd8: ; 0x0208edd8 mov r5, r0 mov r2, r5 mov r4, r1 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r5, #0xc mov r1, r4 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldmia sp!, {r3, r4, r5, pc} arm_func_end func_ov00_0208edd8 @@ -9848,14 +9848,14 @@ func_ov00_0208ee00: ; 0x0208ee00 str r4, [sp, #0xc] str r4, [sp, #0x10] str r4, [sp, #0x14] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r5, #0xc add r1, sp, #0 mov r2, r0 str r4, [sp] str r4, [sp, #4] str r4, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, pc} arm_func_end func_ov00_0208ee00 @@ -9896,11 +9896,11 @@ func_ov00_0208ee90: ; 0x0208ee90 mov r4, r3 ldr r7, [sp, #0x38] ldr r6, [sp, #0x3c] - bl func_01ff9bf8 + bl Vec3p_Sub add r2, sp, #0 mov r0, r4 mov r1, r8 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0xc ldr r3, [r9, #0xc] ldr r2, [r5, #0xc] @@ -9911,7 +9911,7 @@ func_ov00_0208ee90: ; 0x0208ee90 adc r2, r2, #0 mov r8, r3, lsr #0xc orr r8, r8, r2, lsl #20 - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, r8 bgt _0208ef1c mov r0, #0 @@ -9923,7 +9923,7 @@ func_ov00_0208ee90: ; 0x0208ee90 _0208ef1c: add r0, sp, #0 mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot mov r4, r0 cmp r4, #0 addle sp, sp, #0x18 @@ -9931,11 +9931,11 @@ _0208ef1c: ldmleia sp!, {r3, r4, r5, r6, r7, r8, r9, pc} add r0, sp, #0xc add r1, sp, #0 - bl func_01ff9c2c + bl Vec3p_Dot mov r5, r0, lsl #0x1 add r0, sp, #0xc mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot smull r1, r2, r5, r5 adds r3, r1, #0x800 sub r0, r0, r8 @@ -10008,14 +10008,14 @@ func_ov00_0208f030: ; 0x0208f030 mov r0, r5 mov r1, r7 add r4, r3, r4 - bl func_01ff9bf8 + bl Vec3p_Sub add r2, sp, #0x10 mov r0, r6 mov r1, r5 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x10 mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot movs r6, r0 bne _0208f0b4 ldr r3, [r7, #0xc] @@ -10034,11 +10034,11 @@ func_ov00_0208f030: ; 0x0208f030 _0208f0b4: add r0, sp, #0x10 add r1, sp, #0x1c - bl func_01ff9c2c + bl Vec3p_Dot mov r5, r0 add r0, sp, #0x1c mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot smull r2, r1, r5, r5 adds r7, r2, #0x800 smull r2, r3, r4, r4 @@ -10109,14 +10109,14 @@ func_ov00_0208f1a0: ; 0x0208f1a0 mov r0, r6 mov r1, r7 add r5, r3, r4 - bl func_01ff9bf8 + bl Vec3p_Sub add r2, sp, #0x10 mov r0, r8 mov r1, r6 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x10 mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot movs r4, r0 bne _0208f224 ldr r3, [r7, #0xc] @@ -10135,11 +10135,11 @@ func_ov00_0208f1a0: ; 0x0208f1a0 _0208f224: add r0, sp, #0x10 add r1, sp, #0x1c - bl func_01ff9c2c + bl Vec3p_Dot mov r6, r0 add r0, sp, #0x1c mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot smull r1, r3, r6, r6 adds r6, r1, #0x800 smull r2, r1, r5, r5 @@ -10321,7 +10321,7 @@ func_ov00_0208f478: ; 0x0208f478 mov r0, r8 mov r1, r9 mov r6, r3 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r5, [sp, #0x14] smull r3, r2, r0, r0 @@ -10361,15 +10361,15 @@ _0208f538: _0208f544: add r0, sp, #0x18 mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot mov r4, r0 add r0, sp, #0xc add r1, sp, #0x18 - bl func_01ff9c2c + bl Vec3p_Dot mov r5, r0, lsl #0x1 add r0, sp, #0xc mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot sub r1, r0, r10 smull r2, r0, r5, r5 adds r3, r2, #0x800 @@ -10425,7 +10425,7 @@ _0208f628: mov r0, r3 mov r1, r7 mov r2, r3 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r7, #4] ldr r3, [r8, #4] smull r1, r0, r4, r0 @@ -11265,7 +11265,7 @@ _02090004: sub r3, r8, #5 mov r3, r3, lsl #0xc str r3, [sp, #0x5c] - bl func_01ff9bc4 + bl Vec3p_Add cmp r5, #0xa bge _020902d4 ldr r1, _02090320 ; =gMapManager @@ -12737,7 +12737,7 @@ func_ov00_02090f74: ; 0x02090f74 str r3, [sp, #0x18] ldr r3, [ip, #0x268] str r3, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r4, #4] add r1, sp, #8 bl func_ov00_02087df8 @@ -13958,7 +13958,7 @@ func_ov00_02091fe8: ; 0x02091fe8 str r3, [sp, #4] ldr r3, [r4, #0x274] str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp, #0x2c] add r0, sp, #0 rsb r1, r1, #0 @@ -13989,7 +13989,7 @@ _02092098: add r0, sp, #0 add r1, sp, #0xc mov r2, r6 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0x18] mov r1, #0 str r0, [r5] @@ -14202,7 +14202,7 @@ _02092368: add r2, sp, #0x38 add r0, r5, #0x40 add r1, r5, #0x4c - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [r5, #4] ldr r0, [sp, #0x38] ldr r6, [r1, #0x15c] @@ -14223,7 +14223,7 @@ _020923dc: add r2, sp, #0x2c add r0, r5, #8 add r1, r5, #0x4c - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [r5, #4] ldr r0, [sp, #0x2c] ldr r6, [r1, #0x15c] @@ -14252,7 +14252,7 @@ _0209242c: mov r0, r3 mov r2, r3 add r1, r5, #0x40 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [r5, #4] ldr r0, [sp, #0x14] ldr r7, [r1, #0x15c] @@ -14317,11 +14317,11 @@ func_ov00_020924b8: ; 0x020924b8 ldrh r5, [r3] moveq r6, #0xa000 moveq r7, #0xd000 - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x29 blt _02092684 add r0, sp, #0xe8 - bl func_01ff9cec + bl Vec3p_Length ldr r1, _020931e4 ; =0x0000028f cmp r0, r1 bge _02092684 @@ -14340,12 +14340,12 @@ func_ov00_020924b8: ; 0x020924b8 add r0, sp, #0xe8 str r3, [sp, #0xe8] str r1, [sp, #0xf0] - bl func_01ff9cec + bl Vec3p_Length mov r6, r0 add r0, r4, #0x28 - bl func_01ff9cec + bl Vec3p_Length add r0, r4, #0x1c - bl func_01ff9cec + bl Vec3p_Length cmp r0, r6 ble _02092634 ldr r2, [sp, #0xe8] @@ -14390,7 +14390,7 @@ _02092658: add r0, sp, #0x100 add r1, r4, #0x1c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0xe8] str r0, [r4, #0x28] ldr r0, [sp, #0xec] @@ -14402,7 +14402,7 @@ _02092684: add r0, sp, #0x100 add r1, r4, #0x1c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x1c] str r0, [r4, #0x28] ldr r0, [r4, #0x20] @@ -14521,7 +14521,7 @@ _02092824: mov r0, r3 mov r2, r3 add r1, r4, #0x40 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [r4, #4] ldr r0, [sp, #0xc4] ldr r7, [r1, #0x15c] @@ -14535,7 +14535,7 @@ _02092824: add r1, r1, r5, asr #16 mov r1, r1, lsl #0x10 mov r5, r1, asr #0x10 - bl func_01ff9cec + bl Vec3p_Length mov r7, r0 mov r0, r4 bl func_ov00_02090a7c @@ -14604,7 +14604,7 @@ _0209295c: mov r0, r3 mov r2, r3 add r1, r4, #0x40 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [r4, #4] ldr r0, [sp, #0xac] ldr r7, [r1, #0x15c] @@ -14628,7 +14628,7 @@ _020929c8: add r2, sp, #0xa0 add r0, r4, #0x40 add r1, r4, #0x4c - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [r4, #4] ldr r0, [sp, #0xa0] ldr r7, [r1, #0x15c] @@ -14664,7 +14664,7 @@ _02092a50: add r0, sp, #0x100 add r2, sp, #0x94 add r1, r4, #0x4c - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [r4, #4] ldr r0, [sp, #0x94] ldr r7, [r1, #0x15c] @@ -14871,7 +14871,7 @@ _02092d00: mov r0, r3 mov r2, r3 add r1, sp, #0x7c - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x64 bl func_01fffb4c add r0, sp, #0x64 @@ -14880,13 +14880,13 @@ _02092d00: add r0, sp, #0x7c add r1, sp, #0x64 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x7c add r1, sp, #0x70 add r2, sp, #0x58 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x58 - bl func_01ff9cec + bl Vec3p_Length mov r5, r0 cmp r5, #0x5000 blt _02092df4 @@ -14907,7 +14907,7 @@ _02092d00: add r0, sp, #0x7c add r1, sp, #0x58 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add _02092df4: ldr r2, [sp, #0x7c] ldr r1, [sp, #0x80] @@ -14969,19 +14969,19 @@ _02092e60: mov r0, r3 mov r2, r3 add r1, sp, #0x40 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x34 mov r1, #0x800 bl func_01fffbec add r0, sp, #0x34 - bl func_01ff9cec + bl Vec3p_Length mov r5, r0 ldr r0, _020931fc ; =0x00001ccd cmp r5, r0 blt _02092f28 add r0, sp, #0x34 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r0, _02093200 ; =0xffffe333 add r1, r5, r0 rsb r0, r0, #0 @@ -14993,7 +14993,7 @@ _02092f28: add r0, r4, #0x34 add r1, sp, #0x34 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0x3c str r0, [r4, #0x18] ldr r0, [r4, #0x34] @@ -15200,26 +15200,26 @@ func_ov00_0209320c: ; 0x0209320c mov r6, r1 mov r4, r0 mov r7, r3 - bl func_01ff9bf8 + bl Vec3p_Sub add r2, sp, #0 mov r0, r5 mov r1, r6 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp, #0x38] add r0, sp, #0 bl func_01fffbec add r0, sp, #0xc - bl func_01ff9cec + bl Vec3p_Length mov r6, r0 add r0, sp, #0xc add r1, sp, #0 - bl func_01ff9c2c + bl Vec3p_Dot mov r1, r6 bl Divide mov r5, r0 add r0, sp, #0xc mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r3, [sp, #0x30] sub r2, r7, r6 smull lr, ip, r3, r2 @@ -15245,7 +15245,7 @@ func_ov00_0209320c: ; 0x0209320c mov r0, r4 mov r2, r4 add r1, sp, #0xc - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end func_ov00_0209320c @@ -15439,7 +15439,7 @@ func_ov00_02093508: ; 0x02093508 str r3, [sp, #4] ldr r3, [r4, #0x274] str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r4, #0x200 ldrsh r1, [r0, #0x26] add r0, sp, #0 @@ -15459,7 +15459,7 @@ func_ov00_02093508: ; 0x02093508 mov r2, r7 add r0, sp, #0xc add r1, sp, #0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0x28] ldr r1, [sp, #0x98] sub r0, r0, r8, asr #16 @@ -16195,7 +16195,7 @@ _02093e70: str r4, [sp, #0x34] str r3, [sp, #0x38] str r4, [sp, #0x3c] - bl func_01ff9bf8 + bl Vec3p_Sub mov r3, r4 add r2, r3, #0x1800 add r0, sp, #0x58 @@ -16204,7 +16204,7 @@ _02093e70: mov r2, r0 str r3, [sp, #0x28] str r3, [sp, #0x30] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r1, r0, #7 @@ -17395,15 +17395,15 @@ func_ov00_02094c10: ; 0x02094c10 add r1, sp, #0 add r2, sp, #0xc mov r0, r4 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r5, #0x14 add r1, sp, #0xc mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r5, #0x20 add r1, sp, #0xc mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, pc} arm_func_end func_ov00_02094c10 @@ -17970,7 +17970,7 @@ func_ov00_02095278: ; 0x02095278 add r0, sp, #0xc add r1, sp, #0 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [r6, #0xc] bl Divide @@ -18626,7 +18626,7 @@ _02095a2c: add r1, sp, #0x64 mov r2, r11 str r5, [sp, #0x6c] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0x1000 str r0, [sp, #0x58] mov r0, #0x5000 @@ -18635,7 +18635,7 @@ _02095a2c: add r1, sp, #0x58 mov r2, r0 str r5, [sp, #0x60] - bl func_01ff9bc4 + bl Vec3p_Add cmp r9, #0 beq _02095c74 cmp r6, #0x3000 @@ -18664,7 +18664,7 @@ _02095ac0: add r1, sp, #0x4c mov r2, r11 str r5, [sp, #0x54] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [sp, #0x40] mov r0, #0x5000 @@ -18673,7 +18673,7 @@ _02095ac0: add r1, sp, #0x40 mov r2, r0 str r5, [sp, #0x48] - bl func_01ff9bc4 + bl Vec3p_Add cmp r9, #0 beq _02095c74 cmp r6, #0x3000 @@ -18702,7 +18702,7 @@ _02095b54: add r1, sp, #0x34 mov r2, r11 str r4, [sp, #0x34] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0x5000 str r0, [sp, #0x2c] mov r0, #0x1000 @@ -18711,7 +18711,7 @@ _02095b54: add r1, sp, #0x28 mov r2, r0 str r4, [sp, #0x28] - bl func_01ff9bc4 + bl Vec3p_Add cmp r9, #0 beq _02095c74 cmp r6, #0x3000 @@ -18740,7 +18740,7 @@ _02095be8: add r1, sp, #0x1c mov r2, r11 str r4, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0x5000 str r0, [sp, #0x14] mov r0, #0 @@ -18749,7 +18749,7 @@ _02095be8: add r1, sp, #0x10 mov r2, r0 str r4, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add cmp r9, #0 beq _02095c74 cmp r6, #0x3000 @@ -19128,14 +19128,14 @@ _020960b0: mov r0, r5 mov r1, r6 mov r2, r5 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r4] mov r1, r11 bl _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p mov r0, r5 mov r1, r11 mov r2, r5 - bl func_01ff9bc4 + bl Vec3p_Add mov r2, r7 mov r0, r10 mov r1, r5 diff --git a/asm/ov00/ov00_020980f4.inc b/asm/ov00/ov00_020980f4.inc index 27495b8a..979182fa 100644 --- a/asm/ov00/ov00_020980f4.inc +++ b/asm/ov00/ov00_020980f4.inc @@ -139,11 +139,11 @@ .extern func_01ff8230 .extern func_01ff98f0 .extern func_01ff9b88 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9cec -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Length +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffa8d4 diff --git a/asm/ov00/ov00_020980f4.s b/asm/ov00/ov00_020980f4.s index 24f36aa9..b0f3ac72 100644 --- a/asm/ov00/ov00_020980f4.s +++ b/asm/ov00/ov00_020980f4.s @@ -5444,7 +5444,7 @@ func_ov00_0209c648: ; 0x0209c648 mov r0, ip mov r1, r3 mov r2, ip - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0209c780 ; =data_027e0f78 ldr r1, [sp, #0x18] ldr r2, [r0] @@ -5458,7 +5458,7 @@ func_ov00_0209c648: ; 0x0209c648 ldmeqia sp!, {r4, r5, pc} add r0, sp, #0xc mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r1, [sp, #0xc] ldr r0, [sp, #0x10] rsb lr, r1, #0 @@ -5858,10 +5858,10 @@ _0209cc2c: .word gMapManager .global func_ov00_0209cc30 arm_func_start func_ov00_0209cc30 func_ov00_0209cc30: ; 0x0209cc30 - ldr ip, _0209cc38 ; =func_01ff9cec + ldr ip, _0209cc38 ; =Vec3p_Length bx ip .align 2, 0 -_0209cc38: .word func_01ff9cec +_0209cc38: .word Vec3p_Length arm_func_end func_ov00_0209cc30 .global func_ov00_0209cc3c @@ -11537,7 +11537,7 @@ _020a12f8: add r0, r4, #0x18 add r1, sp, #0 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r3, r4, pc} .align 2, 0 @@ -12967,7 +12967,7 @@ _020a23d8: mov r0, r3 mov r2, r3 add r1, r9, #0x20 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r9, #0x20 add r3, sp, #0x10 ldmia r0, {r0, r1, r2} @@ -12975,7 +12975,7 @@ _020a23d8: ldr r0, [sp, #0xec] add r1, sp, #0x1c mov r2, r3 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [sp, #0x10] ldr r0, [sp, #0x14] str r1, [sp, #0x40] @@ -18493,7 +18493,7 @@ _020a6970: str r3, [sp, #8] ldr r3, [r5, #0x298] str r3, [sp, #0xc] - bl func_01ff9bf8 + bl Vec3p_Sub mov r2, #0 mov r0, r6 sub r1, r2, #0x4000 @@ -18518,7 +18518,7 @@ _020a6a50: add r0, sp, #0x7c add r1, sp, #0x64 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, [r10, #0x1c] ldr r1, [sp, #0x80] ldr r0, _020a6dec ; =0x00001ccd @@ -18562,7 +18562,7 @@ _020a6ae0: add r1, sp, #0x7c mov r0, r3 mov r2, r3 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x58] ldr r1, [sp, #0x60] bl func_01ffa0f4 @@ -18611,7 +18611,7 @@ _020a6b9c: add r1, sp, #0x7c mov r0, r3 mov r2, r3 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x40] ldr r1, [sp, #0x48] bl func_01ffa0f4 @@ -18631,9 +18631,9 @@ _020a6b9c: mov r0, r3 mov r2, r3 add r1, sp, #0x34 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x28 - bl func_01ff9cec + bl Vec3p_Length mov r5, r0 mov r0, r10 bl func_ov00_02090a7c @@ -18746,7 +18746,7 @@ _020a6d70: add r0, sp, #0x34 add r1, sp, #0x28 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0x34] str r0, [r10, #0x18] ldr r0, [sp, #0x38] diff --git a/asm/ov00/ov00_020b1498.inc b/asm/ov00/ov00_020b1498.inc index 74a9f2f8..e3de343c 100644 --- a/asm/ov00/ov00_020b1498.inc +++ b/asm/ov00/ov00_020b1498.inc @@ -228,12 +228,12 @@ .extern func_01ff8690 .extern func_01ff9158 .extern func_01ff992c -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c2c -.extern func_01ff9cec -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Dot +.extern Vec3p_Length +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffa9fc diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index 9e4046c4..90bd8b7b 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -243,7 +243,7 @@ _020b16e0: bl func_ov00_0208b988 add r0, r5, #8 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize _020b1738: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} @@ -380,10 +380,10 @@ func_ov00_020b18d8: ; 0x020b18d8 mov r0, r1 add r1, sp, #0 mov r5, r2 - bl func_01ff9d4c + bl Vec3p_Normalize add r1, sp, #0 mov r0, r4 - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 addge sp, sp, #0xc ldmgeia sp!, {r4, r5, pc} @@ -397,7 +397,7 @@ func_ov00_020b18d8: ; 0x020b18d8 mov r2, r4 mov r3, r4 orr r0, r0, ip, lsl #20 - bl func_01ff9e64 + bl Vec3p_Axpy add sp, sp, #0xc ldmia sp!, {r4, r5, pc} arm_func_end func_ov00_020b18d8 @@ -2008,7 +2008,7 @@ _020b2db8: mov r1, r0 add r2, sp, #8 mov r0, r5 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 mov r0, r4 str r1, [sp, #0xc] @@ -2045,7 +2045,7 @@ _020b2db8: bl func_ov05_02110228 _020b2e68: add r0, sp, #8 - bl func_01ff9cec + bl Vec3p_Length cmp r0, r5 movle r0, #1 movgt r0, #0 @@ -5264,7 +5264,7 @@ _020b5540: ldr r2, [r5, #8] str r2, [sp, #0x6c] str r1, [sp, #0x68] - bl func_01ff9cec + bl Vec3p_Length ldr r1, _020b5c80 ; =data_027e0fb8 mov r7, r0 ldr r0, [r1] @@ -5317,7 +5317,7 @@ _020b5630: blt _020b572c mov r1, r8 add r0, r6, #0xe4 - bl func_01ff9c2c + bl Vec3p_Dot rsbs r7, r0, #0 beq _020b5708 ldr r0, [r6, #0xe8] @@ -5327,7 +5327,7 @@ _020b5630: mov r2, r8 mov r3, r8 add r1, r6, #0xe4 - bl func_01ff9e64 + bl Vec3p_Axpy _020b5670: ldr r0, [r6, #0x108] cmp r0, #0 @@ -5338,7 +5338,7 @@ _020b5670: mov r2, r8 mov r3, r8 add r1, r6, #0x108 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r2, [r8] mov r0, #0x800 mov r1, r2, asr #0x1f @@ -5376,7 +5376,7 @@ _020b5708: mov r2, r5 mov r3, r5 add r0, r7, r0, asr #12 - bl func_01ff9e64 + bl Vec3p_Axpy _020b572c: ldrsh r0, [r6, #0x5a] cmp r0, #4 @@ -5390,14 +5390,14 @@ _020b572c: ldr r2, [r5, #8] str r2, [sp, #0x60] str r1, [sp, #0x5c] - bl func_01ff9cec + bl Vec3p_Length mov r7, r0 bl func_ov23_02177e7c cmp r7, r0, lsl #1 ble _020b57a0 add r0, sp, #0x58 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize bl func_ov23_02177e7c mov r1, r0 add r0, sp, #0x58 @@ -5483,10 +5483,10 @@ _020b5884: bne _020b5a04 add r0, sp, #0x4c mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r1, sp, #0x4c mov r0, r5 - bl func_01ff9c2c + bl Vec3p_Dot ldr r3, [sp, #0x4c] ldr r2, [sp, #0x50] smull r4, r7, r3, r0 @@ -5511,7 +5511,7 @@ _020b5884: mov r0, r5 str r7, [sp, #0x40] str r3, [sp, #0x48] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, _020b5c94 ; =gPlayerLink ldr r4, [r0] mov r0, r4 @@ -5549,13 +5549,13 @@ _020b5884: add r0, sp, #0x28 add r1, r6, #0x20 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub mov r2, #0 add r0, sp, #0x34 add r1, sp, #0x28 str r2, [sp, #0x38] str r2, [sp, #0x2c] - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 bge _020b5a04 ldr r0, [sp, #0x40] @@ -5622,7 +5622,7 @@ _020b5a40: ble _020b5b1c mov r0, r5 add r1, r6, #0x120 - bl func_01ff9c2c + bl Vec3p_Dot ldr r1, [r6, #0x120] smull r2, r1, r0, r1 adds r2, r2, #0x800 @@ -5645,7 +5645,7 @@ _020b5b1c: mov r0, r4 mov r3, r5 add r1, r6, #0x120 - bl func_01ff9e64 + bl Vec3p_Axpy mov r7, #0 _020b5b40: cmp r7, #0 @@ -5843,7 +5843,7 @@ _020b5e00: add r1, r7, #0x20 add r0, sp, #0x10c mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add ldr r3, _020b6ac4 ; =0x0000ffff add r1, sp, #0x114 strh r3, [r1, #0xf4] @@ -6058,7 +6058,7 @@ _020b6110: ldr r3, [r7, #0x28] add r1, r7, #0x30 str r3, [sp, #0xdc] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [sp, #0xd8] ldrsh r0, [r7, #0x60] @@ -6070,7 +6070,7 @@ _020b6110: sub r8, r1, r0 _020b6168: add r0, sp, #0xd4 - bl func_01ff9cec + bl Vec3p_Length mov r11, r0 bl func_ov23_02177e7c add r1, r0, r0, lsl #2 @@ -6080,7 +6080,7 @@ _020b6168: ble _020b61d4 add r0, sp, #0xd4 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize bl func_ov23_02177e7c add r1, r0, r0, lsl #2 mov r0, r1, asr #0x1 @@ -6138,7 +6138,7 @@ _020b61e0: mov r1, r10 mov r2, r8 str r3, [sp, #0xd0] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 mvn r1, #0 str r0, [sp, #0x20] @@ -6401,17 +6401,17 @@ _020b6650: _020b6658: add r1, sp, #0x1fc mov r0, r6 - bl func_01ff9c2c + bl Vec3p_Dot mov r9, r0 add r0, sp, #0x1fc - bl func_01ff9cec + bl Vec3p_Length mov r1, r0 rsb r0, r9, #0 bl Divide add r1, sp, #0x1fc mov r2, r6 mov r3, r6 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, [r5] cmp r0, #0 ldreq r0, [r5, #4] @@ -6781,10 +6781,10 @@ func_ov00_020b6ba4: ; 0x020b6ba4 beq _020b6bdc add r0, r4, #0x18 add r1, r6, #0xf0 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, r4, #0x18 add r1, r6, #0xe4 - bl func_01ff9d4c + bl Vec3p_Normalize _020b6bdc: ldrb r0, [r4, #0x58] cmp r0, #0 @@ -6805,7 +6805,7 @@ _020b6bdc: add r0, r4, #0xc add r1, r6, #0x44 ldr r7, [r6, #0xd8] - bl func_01ff9c2c + bl Vec3p_Dot rsb r0, r0, #0 cmp r0, r7 movle r0, r7 @@ -6830,7 +6830,7 @@ _020b6c3c: bne _020b6de0 add r1, sp, #0x50 add r0, r4, #0xc - bl func_01ff9d4c + bl Vec3p_Normalize ldr r0, [r5, #4] cmp r0, #0 addgt sp, sp, #0xbc @@ -6846,11 +6846,11 @@ _020b6c3c: add r0, sp, #0x44 add r2, sp, #0x38 add r1, r6, #0x20 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x44 add r2, sp, #0x2c add r1, r6, #0x30 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 ldr r4, _020b6e68 ; =0x0000ffff ldr r3, [sp, #0x38] @@ -7105,7 +7105,7 @@ _020b7000: add r2, r6, #4 str ip, [sp, #0x20] str lr, [sp, #0x28] - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, _020b7334 ; =gMapManager ldr r6, [sp, #0x14] ldr r3, [sp, #0x18] @@ -7136,7 +7136,7 @@ _020b7000: _020b70fc: add r0, sp, #0x80 add r1, sp, #0x20 - bl func_01ff9c2c + bl Vec3p_Dot ldr r1, [r4, #0xd4] rsb r2, r0, #0 cmp r2, r1 @@ -7266,7 +7266,7 @@ _020b71f0: ldr r2, [r2, #0x48] str r2, [sp, #0x74] ldr r5, [r4, #0xd8] - bl func_01ff9c2c + bl Vec3p_Dot rsb r6, r0, #0 cmp r6, r5 movle r6, r5 @@ -7510,7 +7510,7 @@ _020b75b0: add r0, sp, #0x14 add r1, r6, #0x20 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, _020b7750 ; =gMapManager ldrb r2, [r6, #0xc4] ldrb r1, [r6, #0xc5] @@ -7524,7 +7524,7 @@ _020b75b0: add r0, sp, #8 add r1, r6, #0x20 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r6, #0x44] cmp r0, #0 ldreq r0, [r6, #0x48] @@ -7927,7 +7927,7 @@ _020b7bc0: str r1, [r4, #0x4c] _020b7be0: add r0, sp, #0x20 - bl func_01ff9cec + bl Vec3p_Length str r0, [r4, #0x58] cmp r0, #0 ble _020b7c20 @@ -8034,7 +8034,7 @@ func_ov00_020b7d4c: ; 0x020b7d4c mov r0, r2 add r1, ip, #0x44 add r2, ip, #0x38 - bl func_01ff9e64 + bl Vec3p_Axpy ldmia sp!, {r3, pc} arm_func_end func_ov00_020b7d4c @@ -8998,7 +8998,7 @@ func_ov00_020b86a4: ; 0x020b86a4 ldr r0, _020b86e4 ; =0x00000333 add r2, r2, #4 add r3, r3, #4 - bl func_01ff9e64 + bl Vec3p_Axpy _020b86dc: mov r0, #0 ldmia sp!, {r3, pc} @@ -9502,7 +9502,7 @@ func_ov00_020b8c50: ; 0x020b8c50 add r0, sp, #0 add r1, r4, #0x48 add r2, r4, #0x60 - bl func_01ff9bf8 + bl Vec3p_Sub add sp, sp, #0xc ldmia sp!, {r3, r4, pc} arm_func_end func_ov00_020b8c50 @@ -9546,7 +9546,7 @@ func_ov00_020b8c98: ; 0x020b8c98 add r0, sp, #4 add r1, r4, #0x48 add r2, r4, #0x60 - bl func_01ff9bf8 + bl Vec3p_Sub add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end func_ov00_020b8c98 @@ -9583,7 +9583,7 @@ _020b8d78: add r1, r4, #0x48 ldreq r7, _020b9154 ; =0x00000333 moveq r6, #0x6a - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp, #8] ldr ip, [sp, #0xc] smull r3, r0, r1, r5 @@ -9692,7 +9692,7 @@ _020b8ef0: add r0, r2, r1 str r0, [r4, #0x68] add r0, r4, #0x60 - bl func_01ff9cec + bl Vec3p_Length ldr r1, _020b9164 ; =0x000004cd cmp r0, r1 addle sp, sp, #0x14 @@ -10482,7 +10482,7 @@ _020b99c8: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 bl _ZN5Actor20IncreaseActiveFramesEv mov r0, r4 @@ -10510,7 +10510,7 @@ _020b99c8: add r1, r1, #0x300 add r0, r4, #0x60 str r1, [sp, #4] - bl func_01ff9cec + bl Vec3p_Length add r1, r4, #0x200 ldrsh r3, [r1, #0x20] mov r1, #0x3000 @@ -10719,7 +10719,7 @@ _020b9d58: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 ldr r1, [r0] ldr r1, [r1, #0xd8] @@ -11060,7 +11060,7 @@ func_ov00_020ba204: ; 0x020ba204 add r3, sp, #0x40 mov r1, r4 mov r2, r5 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, _020ba340 ; =data_ov00_020e67b8 add lr, sp, #0x30 str r0, [sp, #0x2c] @@ -11219,7 +11219,7 @@ func_ov00_020ba414: ; 0x020ba414 add r1, sp, #0 mov r0, r4 add r2, r5, #0x158 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 @@ -12236,9 +12236,9 @@ func_ov00_020bb164: ; 0x020bb164 add r2, sp, #0 add r0, r4, #0x48 add r1, r5, #0xc - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 - bl func_01ff9cec + bl Vec3p_Length ldr r1, [r5, #8] cmp r0, r1 addge sp, sp, #0xc @@ -12613,7 +12613,7 @@ func_ov00_020bb46c: ; 0x020bb46c ldr r0, _020bb4d4 ; =gPlayerPos mov r2, r4 add r1, r3, #0x34 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, _020bb4d0 ; =data_027e0fcc mov r0, r5 ldr r1, [r1] @@ -12761,13 +12761,13 @@ func_ov00_020bb604: ; 0x020bb604 add r2, sp, #0 mov r0, r6 str r3, [sp, #0x10] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp, #4] add r0, sp, #0 str r1, [r5] mov r1, #0 str r1, [sp, #4] - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0 addle sp, sp, #0x1c str r0, [r4] @@ -12991,7 +12991,7 @@ func_ov00_020bb948: ; 0x020bb948 ldr r1, _020bb9a0 ; =gPlayerPos add r2, sp, #0 mov r0, r4 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -14033,9 +14033,9 @@ func_ov00_020bc520: ; 0x020bc520 add r1, sp, #0xc add r2, sp, #0 mov r0, r5 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 - bl func_01ff9cec + bl Vec3p_Length mov r5, r0 cmp r5, r4 addge sp, sp, #0x18 @@ -14272,7 +14272,7 @@ _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p: ; 0x020bc854 ldr r0, _020bc8b0 ; =gPlayerPos mov r2, r4 add r1, r1, #0x34 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _020bc8b4 ; =data_027e0fd0 mov r1, r4 ldr r0, [r0] @@ -14976,7 +14976,7 @@ func_ov00_020bd0bc: ; 0x020bd0bc mov r4, r2 ldr r1, _020bd250 ; =gPlayerPos add r2, sp, #0 - bl func_01ff9bf8 + bl Vec3p_Sub cmp r4, #0 beq _020bd138 ldr r3, [sp] @@ -17840,7 +17840,7 @@ _020bf374: add r0, sp, #0x1c add r1, sp, #0x10 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #1 str r0, [sp] ldr r0, _020bf4d4 ; =data_027e0e58 @@ -17862,7 +17862,7 @@ _020bf374: bl func_0202af4c add r0, sp, #4 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r3, [sp, #8] ldr r2, [sp, #0xc] ldr r0, [sp, #4] @@ -18262,7 +18262,7 @@ _020bf9a0: add r0, sp, #0xcc add r1, sp, #0xd8 add r2, sp, #0xb4 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r4 bl func_ov00_020bf4f4 cmp r0, #0 @@ -18308,7 +18308,7 @@ _020bfa24: add r1, sp, #0x9c add r0, sp, #0xa8 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x2c] cmp r0, #0 beq _020bfb20 diff --git a/asm/ov00/ov00_020c3e54.inc b/asm/ov00/ov00_020c3e54.inc index f3bf9abd..fd49d1a5 100644 --- a/asm/ov00/ov00_020c3e54.inc +++ b/asm/ov00/ov00_020c3e54.inc @@ -327,13 +327,13 @@ .extern func_01ff9958 .extern func_01ff998c .extern func_01ff9b4c -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c2c -.extern func_01ff9c68 -.extern func_01ff9cec -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Dot +.extern Vec3p_Cross +.extern Vec3p_Length +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ff9f3c .extern func_01ffa0f4 @@ -499,7 +499,7 @@ .extern func_0203e284 .extern func_0203efd8 .extern func_0203f378 -.extern func_02042f74 +.extern abs .extern func_0204b068 .extern func_0204b0a4 .extern func_0204f558 diff --git a/asm/ov00/ov00_020c3e54.s b/asm/ov00/ov00_020c3e54.s index 3e5c2c14..5134d03a 100644 --- a/asm/ov00/ov00_020c3e54.s +++ b/asm/ov00/ov00_020c3e54.s @@ -956,7 +956,7 @@ _020c49fc: add r0, sp, #0x20 add r2, sp, #0x14 add r1, r6, #8 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x14] ldr r1, [sp, #0x1c] bl func_01ffa0f4 @@ -1730,7 +1730,7 @@ func_ov00_020c53b0: ; 0x020c53b0 mov r1, r0 ldr r0, _020c53e4 ; =gPlayerPos add r2, sp, #0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -1817,7 +1817,7 @@ func_ov00_020c54a0: ; 0x020c54a0 mov r1, r7 mov r5, r3 orr r4, r4, ip, lsl #20 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp, #0x20] mov r0, r7 bl func_ov00_020c5464 @@ -2332,7 +2332,7 @@ func_ov00_020c5b34: ; 0x020c5b34 str r3, [sp, #4] ldr r3, [ip, #0x274] str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [r6, #0xc] add r0, sp, #0 add r1, r4, r1, lsl #1 @@ -2342,7 +2342,7 @@ func_ov00_020c5b34: ; 0x020c5b34 mov r2, r5 add r0, sp, #0 add r1, sp, #0xc - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r6, #0x10] sub r0, r0, r4, asr #16 str r0, [r6, #0x10] @@ -2824,7 +2824,7 @@ func_ov00_020c6164: ; 0x020c6164 mov r1, r4 add r2, sp, #0 mov r4, r3 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] cmp r0, #0 ldreq r0, [sp, #8] @@ -2934,7 +2934,7 @@ func_ov00_020c62f0: ; 0x020c62f0 mov r7, r3 ldr r6, [sp, #0x2c] ldr r4, [sp, #0x30] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] cmp r0, #0 ldreq r0, [sp, #8] @@ -3099,7 +3099,7 @@ func_ov00_020c6538: ; 0x020c6538 add r2, sp, #0 mov r1, r4 mov r5, r3 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp] cmp r1, #0 ldreq r0, [sp, #8] @@ -3860,14 +3860,14 @@ func_ov00_020c6e8c: ; 0x020c6e8c ldr r1, [sp] ldr r0, [r4] sub r0, r1, r0 - bl func_02042f74 + bl abs ldr r1, _020c6f04 ; =0x0000019a cmp r0, r1 bgt _020c6ef8 ldr r1, [sp, #8] ldr r0, [r4, #8] sub r0, r1, r0 - bl func_02042f74 + bl abs ldr r1, _020c6f04 ; =0x0000019a cmp r0, r1 addle sp, sp, #0xc @@ -6185,7 +6185,7 @@ _020c8d94: add r0, r0, #4 add r1, r6, #4 add r2, sp, #0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -9226,7 +9226,7 @@ _020cb2a4: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 mov r1, #0 bl func_01fffd04 @@ -9272,7 +9272,7 @@ func_ov00_020cb314: ; 0x020cb314 add r1, ip, #0x60 mov r2, r0 str r3, [ip, #0x68] - bl func_01ff9bc4 + bl Vec3p_Add ldmia sp!, {r3, pc} arm_func_end func_ov00_020cb314 @@ -10584,7 +10584,7 @@ func_ov00_020cc3fc: ; 0x020cc3fc add r0, r4, #0x48 add r1, r4, #0x1ec mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldmia sp!, {r4, pc} .align 2, 0 _020cc434: .word data_027e0ff4 @@ -10619,7 +10619,7 @@ func_ov00_020cc45c: ; 0x020cc45c ldr r0, [r4, #0x210] add r1, r4, #0x1f8 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy ldmia sp!, {r4, pc} arm_func_end func_ov00_020cc45c @@ -10727,7 +10727,7 @@ _020cc5e4: add r0, r4, #0x48 add r1, sp, #0xc mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 mov r1, #0 bl func_01fffd04 @@ -11720,7 +11720,7 @@ func_ov00_020cd174: ; 0x020cd174 add r2, sp, #0 add r0, r0, #0x48 mov r4, r3 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -11764,7 +11764,7 @@ _020cd204: str lr, [sp] str ip, [sp, #4] str r5, [sp, #8] - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, [sp] str r0, [r6, #4] ldr r0, [sp, #4] @@ -11797,7 +11797,7 @@ func_ov00_020cd27c: ; 0x020cd27c add r2, sp, #0 add r0, r4, #4 add r1, r1, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [sp, #4] add r0, sp, #0 @@ -11895,7 +11895,7 @@ func_ov00_020cd384: ; 0x020cd384 add r1, sp, #0xc add r0, r0, #0x48 add r2, sp, #0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -11938,12 +11938,12 @@ _020cd430: str r6, [sp] str lr, [sp, #4] str ip, [sp, #8] - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [r5] add r0, sp, #0 add r1, r1, #0x48 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 mov r3, #0 mov r1, r4 @@ -12043,7 +12043,7 @@ func_ov00_020cd52c: ; 0x020cd52c mov r0, r0, lsl #0x1 add r2, r4, #0x18 add r3, r4, #0x24 - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, #0x1e strh r0, [r4, #0x34] ldr r1, [r4] @@ -12110,14 +12110,14 @@ _020cd690: add r1, sp, #0x18 add r2, r2, #0x48 add r3, r4, #0x18 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, [r4] bl _ZN5Actor14ResetWallTouchEv ldr r1, [r4] add r0, r4, #0x18 add r1, r1, #0x48 add r2, sp, #0xc - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] bl func_01ffa0f4 @@ -12167,7 +12167,7 @@ _020cd690: add r2, r4, #0x18 add r3, r4, #0x24 mov r0, r0, lsl #0x1 - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, #0x1e add sp, sp, #0x24 strh r0, [r4, #0x34] @@ -12183,7 +12183,7 @@ _020cd7d4: add r2, sp, #0 add r0, r4, #0x18 add r1, r1, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -12233,7 +12233,7 @@ _020cd7d4: str r0, [sp, #8] ldr r0, [r4, #0x30] mov r0, r0, lsl #0x1 - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, #0x1e strh r0, [r4, #0x34] add sp, sp, #0x24 @@ -12343,7 +12343,7 @@ func_ov00_020cda0c: ; 0x020cda0c add r0, sp, #0x20 add r2, sp, #0 add r1, r1, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldrsh r5, [sp, #0x30] ldr r0, [sp] mov r1, r5 @@ -12395,7 +12395,7 @@ func_ov00_020cdab0: ; 0x020cdab0 add r0, r2, #0x48 add r1, r2, #0x60 add r2, r2, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, [r4] ldr r0, [r2, #0x64] cmp r0, #0 @@ -12704,7 +12704,7 @@ _020cdec8: str r6, [sp, #0x24] str lr, [sp, #0x28] str ip, [sp, #0x2c] - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [sp, #0x30] ldr ip, [sp, #0x34] ldr r4, [sp, #0x38] @@ -13079,22 +13079,22 @@ func_ov00_020ce440: ; 0x020ce440 mov r0, r5 mov r1, r6 mov r4, r3 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x10 add r1, sp, #0 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, sp, #0 mov r1, r7 - bl func_01ff9c2c + bl Vec3p_Dot rsb r1, r0, #0 str r1, [sp, #0xc] add r0, sp, #0 mov r1, r6 - bl func_01ff9c2c + bl Vec3p_Dot mov r7, r0 add r0, sp, #0 mov r1, r5 - bl func_01ff9c2c + bl Vec3p_Dot ldr r2, [sp, #0xc] sub r1, r7, r0 add r0, r0, r2 @@ -21440,12 +21440,12 @@ func_ov00_020d4880: ; 0x020d4880 add r0, r5, #0x158 add r1, r5, #0x164 add r6, r3, #0x800 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r5, #0x170] add r1, sp, #0 add r2, r5, #0x164 add r3, r5, #0x48 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, [r5, #0x4c] cmp r4, #0 add r0, r0, r6, asr #12 @@ -21656,9 +21656,9 @@ func_ov00_020d4b54: ; 0x020d4b54 str r4, [sp, #0x50] ldr r3, [r10, #0x5c] str r3, [sp, #0x54] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x40 - bl func_01ff9cec + bl Vec3p_Length add r1, sp, #0x4c mov r9, r0 add r11, sp, #4 @@ -21691,7 +21691,7 @@ _020d4c28: mov r1, r6 mov r2, r11 mov r3, r11 - bl func_01ff9e64 + bl Vec3p_Axpy sub r9, r9, r8 b _020d4c64 _020d4c4c: @@ -21699,7 +21699,7 @@ _020d4c4c: mov r1, r6 mov r2, r11 mov r3, r11 - bl func_01ff9e64 + bl Vec3p_Axpy mov r9, #0 _020d4c64: ldr r1, [sp, #0x28] @@ -21896,7 +21896,7 @@ func_ov00_020d4ee0: ; 0x020d4ee0 mov r4, r1 mov r5, r0 mov r0, r4 - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x29 ble _020d4f3c ldr r0, _020d4f7c ; =gPlayerPos diff --git a/asm/ov00/ov00_020d59f0.inc b/asm/ov00/ov00_020d59f0.inc index 8d9d15e0..7b8c777f 100644 --- a/asm/ov00/ov00_020d59f0.inc +++ b/asm/ov00/ov00_020d59f0.inc @@ -441,7 +441,7 @@ _020d5ff8: beq _020d6108 add r0, sp, #0xc mov r1, r4 - bl func_01ff9c2c + bl Vec3p_Dot add r0, r0, #0x1000 mov r0, r0, lsl #0x1 bl func_01ff9958 @@ -449,7 +449,7 @@ _020d5ff8: add r0, sp, #0xc add r1, sp, #0x18 add r2, sp, #0 - bl func_01ff9c68 + bl Vec3p_Cross cmp r4, #0 rsblt r0, r4, #0 movge r0, r4 diff --git a/asm/ov02.inc b/asm/ov02.inc index afd888d4..31ddc3b5 100644 --- a/asm/ov02.inc +++ b/asm/ov02.inc @@ -54,7 +54,7 @@ .extern func_01ff8690 .extern func_01ff9b4c .extern func_01ff9b88 -.extern func_01ff9bc4 +.extern Vec3p_Add .extern func_01ffa9fc .extern func_01ffbe34 .extern func_02002c14 diff --git a/asm/ov02.s b/asm/ov02.s index 2c6d5bfd..0cd31de3 100644 --- a/asm/ov02.s +++ b/asm/ov02.s @@ -5538,11 +5538,11 @@ _020f34a8: add r0, r5, #0x158 add r1, r5, #0x14c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r5, #0x188 add r1, r5, #0x17c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add _020f34c8: mov r0, r5 ldr r1, [r0] diff --git a/asm/ov04.inc b/asm/ov04.inc index 03212281..adf48266 100644 --- a/asm/ov04.inc +++ b/asm/ov04.inc @@ -272,8 +272,8 @@ .extern data_ov40_0218827c .extern data_ov40_0218a0e0 .extern func_01ff892c -.extern func_01ff9bc4 -.extern func_01ff9bf8 +.extern Vec3p_Add +.extern Vec3p_Sub .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffa8d4 diff --git a/asm/ov04.s b/asm/ov04.s index 37536c3a..4ac6eb80 100644 --- a/asm/ov04.s +++ b/asm/ov04.s @@ -2211,7 +2211,7 @@ _02101bda: add r0, r5, #0 add r1, r7, #0 add r2, r5, #0 - blx func_01ff9bc4 + blx Vec3p_Add add r4, r4, #1 add r5, #0xc cmp r4, r6 @@ -11352,7 +11352,7 @@ _021063a4: add r0, r0, #4 add r1, r1, #4 add r2, sp, #0x1c - blx func_01ff9bf8 + blx Vec3p_Sub ldr r0, [sp, #0x1c] ldr r1, [sp, #0x24] blx func_01ffa0f4 @@ -18197,7 +18197,7 @@ _02109820: lsl r1, r1, #4 add r1, r6, r1 add r2, r0, #0 - blx func_01ff9bc4 + blx Vec3p_Add add r0, sp, #0x3c blx func_ov00_020c1500 mov r1, #0 diff --git a/asm/ov05.inc b/asm/ov05.inc index a9942aa2..f5cc7a93 100644 --- a/asm/ov05.inc +++ b/asm/ov05.inc @@ -262,10 +262,10 @@ .extern func_01ff9a80 .extern func_01ff9b24 .extern func_01ff9b4c -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9cec -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Length +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffa8d4 diff --git a/asm/ov05.s b/asm/ov05.s index de21bada..75fd03a2 100644 --- a/asm/ov05.s +++ b/asm/ov05.s @@ -7875,7 +7875,7 @@ _02107310: bl _ZN13LinkStateBase12GetPlayerPosEv add r2, sp, #0 add r1, r5, #0x34 - bl func_01ff9bc4 + bl Vec3p_Add add r2, r4, #0x2c add r1, r4, #0x40 cmp r2, r1 @@ -9215,7 +9215,7 @@ func_ov05_021084f4: ; 0x021084f4 str r3, [sp, #0x10] ldr r3, [r9, #0x10] str r3, [sp, #0x14] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r8, #8] mov r0, r4 str r1, [sp] @@ -9225,7 +9225,7 @@ func_ov05_021084f4: ; 0x021084f4 ldr r3, [r8, #0x10] mov r2, r0 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #0x78] ldr r0, [sp, #0x64] subs r2, r1, r0 @@ -9332,7 +9332,7 @@ _0210870c: add r0, sp, #0x54 add r1, sp, #0x48 add r2, sp, #0x3c - bl func_01ff9bf8 + bl Vec3p_Sub cmp r6, #0 cmpgt r4, r6 movgt r4, r6 @@ -9342,7 +9342,7 @@ _0210870c: add r0, r5, #0x2c add r1, sp, #0x3c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0x88 ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc} _02108760: @@ -9354,7 +9354,7 @@ _02108760: add r0, sp, #0x48 add r1, sp, #0x54 add r2, sp, #0x30 - bl func_01ff9bf8 + bl Vec3p_Sub cmp r5, #0 cmpgt r4, r5 movgt r4, r5 @@ -9364,7 +9364,7 @@ _02108760: add r0, r6, #0x2c add r1, sp, #0x30 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0x88 ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc} _021087b4: @@ -9375,7 +9375,7 @@ _021087b4: add r0, sp, #0x54 add r1, sp, #0x48 add r2, sp, #0x24 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r4, r4, lsr #31 mov r1, r0, asr #0x1 cmp r9, #0 @@ -9386,7 +9386,7 @@ _021087b4: add r0, r5, #0x2c add r1, sp, #0x24 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add _02108800: cmp r7, #0 ldrne r5, [r8, #0x38] @@ -9396,7 +9396,7 @@ _02108800: add r0, sp, #0x48 add r1, sp, #0x54 add r2, sp, #0x18 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r4, r4, lsr #31 mov r1, r0, asr #0x1 cmp r5, #0 @@ -9407,7 +9407,7 @@ _02108800: add r0, r6, #0x2c add r1, sp, #0x18 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add _02108850: add sp, sp, #0x88 ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc} @@ -11455,7 +11455,7 @@ _0210a360: str r1, [sp, #0x40] ldr r1, _0210a4cc ; =data_ov05_021122f0 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 bl _ZN13LinkStateBase14GetPlayerAngleEv mov r1, r0 @@ -11474,7 +11474,7 @@ _0210a408: add r0, sp, #0x38 ldr r1, _0210a4d0 ; =data_ov05_021122fc mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 bl _ZN13LinkStateBase14GetPlayerAngleEv ldrsh r1, [r0] @@ -11761,7 +11761,7 @@ _0210a798: cmp r0, #0x2000 ldmltia sp!, {r4, pc} add r0, r4, #0x18 - bl func_01ff9cec + bl Vec3p_Length mov r1, r0 cmp r1, #0x5000 ldr r0, [r4, #4] @@ -11789,7 +11789,7 @@ func_ov05_0210a7d4: ; 0x0210a7d4 bl _ZN13LinkStateBase12GetPlayerPosEv add r2, sp, #0x2c add r1, r6, #0x18 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r6 bl _ZN13LinkStateBase12GetGrabActorEv movs r4, r0 @@ -12118,7 +12118,7 @@ _0210ac7c: mov r1, r0 add r0, sp, #0x18 add r2, sp, #0xc - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] bl func_01ffa0f4 @@ -12142,7 +12142,7 @@ _0210ad00: mov r1, r0 add r0, sp, #0x18 add r2, sp, #0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -13291,9 +13291,9 @@ _0210bce0: mov r1, r0 add r0, sp, #0x14 add r2, sp, #8 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #8 - bl func_01ff9cec + bl Vec3p_Length ldr r1, _0210bd6c ; =0x00000155 cmp r0, r1 blt _0210bd48 @@ -13430,9 +13430,9 @@ _0210beb8: mov r1, r0 add r0, sp, #4 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #4 - bl func_01ff9cec + bl Vec3p_Length ldr r1, _0210bf4c ; =0x00000155 cmp r0, r1 addlt sp, sp, #0x10 @@ -13677,7 +13677,7 @@ func_ov05_0210c20c: ; 0x0210c20c mov r1, r0 add r0, sp, #0x6c add r2, sp, #0x60 - bl func_01ff9bf8 + bl Vec3p_Sub bl func_ov05_02106634 add r1, sp, #8 add r2, sp, #0x60 @@ -15079,7 +15079,7 @@ _0210d4e8: movlt r0, r2 add r1, sp, #0x14 mov r2, r6 - bl func_01ff9e64 + bl Vec3p_Axpy b _0210d684 _0210d5e8: cmp r10, r9 @@ -15120,7 +15120,7 @@ _0210d5e8: add r1, sp, #8 mov r2, r6 mov r3, r6 - bl func_01ff9e64 + bl Vec3p_Axpy _0210d684: add r7, r7, #0x14 add r0, r4, #1 @@ -16895,7 +16895,7 @@ _0210ee40: bl _ZN13LinkStateBase12GetPlayerPosEv add r2, sp, #0x14 add r1, r4, #0x34 - bl func_01ff9bc4 + bl Vec3p_Add add r2, r6, #0x34 add r1, r6, #0x3c cmp r2, r1 @@ -17635,7 +17635,7 @@ func_ov05_0210f808: ; 0x0210f808 mov r1, r0 add r2, sp, #0x2c mov r0, r6 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x2c] ldr r1, [sp, #0x34] bl func_01ffa0f4 @@ -18188,7 +18188,7 @@ _0211008c: mov r0, r10 bl _ZN13LinkStateBase18func_ov00_020a8d40Ev add r0, r0, #0x44 - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0xcd ble _021100cc ldr r1, _02110210 ; =data_ov05_02112b14 @@ -19833,7 +19833,7 @@ _021116a4: add r0, sp, #0x40 sub r1, r2, r1 str r1, [sp, #0x48] - bl func_01ff9cec + bl Vec3p_Length ldr r1, _02111a74 ; =0x00000333 cmp r0, r1 ble _02111734 @@ -20131,7 +20131,7 @@ func_ov05_02111af8: ; 0x02111af8 add r2, sp, #0 add r0, r4, #0x48 add r1, r5, #0xc - bl func_01ff9bf8 + bl Vec3p_Sub ldrsh r6, [r5, #0x18] ldr r0, [sp] ldr r1, [sp, #8] @@ -20143,7 +20143,7 @@ func_ov05_02111af8: ; 0x02111af8 movs r6, r0, asr #0x3 rsbmi r6, r6, #0 add r0, sp, #0 - bl func_01ff9cec + bl Vec3p_Length mov r1, r6, asr #0x1f mov r2, r1, lsl #0xe mov r1, #0x800 diff --git a/asm/ov09.inc b/asm/ov09.inc index 4b5eed79..fd373845 100644 --- a/asm/ov09.inc +++ b/asm/ov09.inc @@ -101,8 +101,8 @@ .extern func_01ff9a18 .extern func_01ff9a50 .extern func_01ff9b4c -.extern func_01ff9bc4 -.extern func_01ff9bf8 +.extern Vec3p_Add +.extern Vec3p_Sub .extern func_01ffa8d4 .extern func_01ffa9fc .extern func_01ffbe34 diff --git a/asm/ov09.s b/asm/ov09.s index 35f4e6fd..93b531f8 100644 --- a/asm/ov09.s +++ b/asm/ov09.s @@ -4810,7 +4810,7 @@ func_ov09_0211530c: ; 0x0211530c ldr r3, [r5, #0x54] mov r2, r0 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r9, #0xc] add r0, sp, #0xc bl func_01fffbec @@ -4821,7 +4821,7 @@ func_ov09_0211530c: ; 0x0211530c mov r1, r6 mov r2, r8 add r0, sp, #0xc - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0x3c ldmia sp!, {r4, r5, r6, r7, r8, r9, pc} .align 2, 0 @@ -4856,7 +4856,7 @@ func_ov09_02115408: ; 0x02115408 mov r1, r4 mov r2, r6 add r0, sp, #0 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, pc} arm_func_end func_ov09_02115408 @@ -4889,7 +4889,7 @@ func_ov09_02115478: ; 0x02115478 mov r1, r4 mov r2, r6 add r0, sp, #0 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, pc} arm_func_end func_ov09_02115478 @@ -5353,7 +5353,7 @@ func_ov09_02115b10: ; 0x02115b10 add r0, r2, #0x400 mov r1, r4 add r2, r2, #0x400 - bl func_01ff9bc4 + bl Vec3p_Add ldmia sp!, {r3, r4, r5, pc} arm_func_end func_ov09_02115b10 @@ -5598,7 +5598,7 @@ func_ov09_02115e38: ; 0x02115e38 add r0, r5, #0x68 mov r1, r4 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldmia sp!, {r3, r4, r5, pc} arm_func_end func_ov09_02115e38 @@ -18415,7 +18415,7 @@ func_ov09_0211d180: ; 0x0211d180 add r0, sp, #0x78 add r2, sp, #0x84 mov r1, r4 - bl func_01ff9bc4 + bl Vec3p_Add mov r3, r5 movs r0, #0x10 beq _0211d27c @@ -18476,7 +18476,7 @@ _0211d2ec: str r3, [sp, #0x10] ldr r3, [r5, #0x4c] str r3, [sp, #0x14] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x6c mov r1, r8 bl func_01fffbec @@ -18489,7 +18489,7 @@ _0211d2ec: ldr r3, [r5, #0x4c] mov r2, r0 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #0x6c] ldr r0, [sp, #0x70] rsb r1, r1, #0 @@ -18582,7 +18582,7 @@ _0211d420: add r0, sp, #0x30 add r1, sp, #0x54 add r2, sp, #0x3c - bl func_01ff9bc4 + bl Vec3p_Add mvn r0, #0x384 str r0, [sp, #0x30] mov r0, #0 @@ -18597,7 +18597,7 @@ _0211d420: add r0, sp, #0x30 add r1, sp, #0x54 add r2, sp, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 ldr r1, _0211d660 ; =0xfffff4a4 str r0, [sp, #0x18] diff --git a/asm/ov12.inc b/asm/ov12.inc index 531e93dd..6ef3b88f 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -196,12 +196,12 @@ .extern func_01ff9958 .extern func_01ff9b4c .extern func_01ff9b88 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c2c -.extern func_01ff9cec -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Dot +.extern Vec3p_Length +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffa9fc diff --git a/asm/ov12.s b/asm/ov12.s index 313b5446..ecc4dd72 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -1553,7 +1553,7 @@ func_ov12_02113f9c: ; 0x02113f9c add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02114060 ; =data_027e0ff8 add r2, sp, #0 ldr r0, [r0] @@ -1595,7 +1595,7 @@ _02114044: add r1, sp, #0 mov r3, r2 mov r0, #0x800 - bl func_01ff9e64 + bl Vec3p_Axpy add sp, sp, #0xc ldmia sp!, {r4, r5, pc} .align 2, 0 @@ -1869,11 +1869,11 @@ _02114398: ldr r3, [r6, #0x50] mov r2, r0 str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0 str r1, [sp, #4] - bl func_01ff9cec + bl Vec3p_Length ldr r2, [r6, #0x76c] add r1, r6, #0x36c add r3, r2, r0 @@ -2036,11 +2036,11 @@ _021145fc: ldr r3, [r8, #0x50] mov r2, r0 str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0 str r1, [sp, #4] - bl func_01ff9cec + bl Vec3p_Length ldr r2, [r8, #0x76c] add r1, r8, #0x36c add r3, r2, r0 @@ -2189,7 +2189,7 @@ _02114854: add r1, sp, #0 mov r3, r2 mov r0, #0x800 - bl func_01ff9e64 + bl Vec3p_Axpy _02114890: mov r0, r4 mov r1, #0 @@ -2604,11 +2604,11 @@ _02114dc8: add r0, sp, #0x3c add r1, sp, #0x24 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x30 add r1, sp, #0x18 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r5, #0 bl func_ov12_02114b18 cmp r0, #0 @@ -2638,7 +2638,7 @@ _02114e5c: add r0, sp, #0x30 add r1, sp, #0x3c add r2, sp, #0xc - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, [sp, #0xc] ldr r1, [sp, #0x10] ldr r0, [sp, #0x14] @@ -2794,11 +2794,11 @@ _0211508c: add r0, sp, #0x34 add r1, sp, #0x1c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x28 add r1, sp, #0x10 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bl func_ov12_0212e264 movs r5, r0 @@ -4438,14 +4438,14 @@ func_ov12_021166e0: ; 0x021166e0 add r2, sp, #0x54 mov r0, ip mov r1, lr - bl func_01ff9bc4 + bl Vec3p_Add b _02116788 _02116774: ldr r0, _021168b0 ; =0x00001ccd add r3, sp, #0x54 mov r1, ip mov r2, lr - bl func_01ff9e64 + bl Vec3p_Axpy _02116788: add r0, sp, #0x6c add r1, sp, #0x78 @@ -4990,14 +4990,14 @@ _02116e4c: blx r1 add r2, sp, #0x48 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r2, sp, #0x3c add r0, r4, #0x760 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x48 add r1, sp, #0x3c - bl func_01ff9c2c + bl Vec3p_Dot mov r5, r0 mov r0, r4 add r1, r4, #0x760 @@ -5089,17 +5089,17 @@ _02116f38: str r5, [sp, #0x28] str lr, [sp, #0x2c] str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x18 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, sp, #0x18 mov r1, #0x1400 bl func_01fffbec add r0, sp, #0xc add r1, sp, #0x18 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, _0211702c ; =0x00000385 add r0, r4, #0x48 add r1, sp, #0xc @@ -6725,7 +6725,7 @@ func_ov12_02118428: ; 0x02118428 mov r0, r3 mov r1, r5 add r2, sp, #0x8c - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x8c add r3, sp, #0x80 ldmia r0, {r0, r1, r2} @@ -6749,7 +6749,7 @@ func_ov12_02118428: ; 0x02118428 bl _ZN10MapManager16MapData_vfunc_68Ev str r0, [sp, #0xa8] add r0, sp, #0x8c - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x3000 ble _0211857c ldr r4, [sp, #0x80] @@ -6764,12 +6764,12 @@ func_ov12_02118428: ; 0x02118428 mov r0, r5 add r1, sp, #0x8c add r2, sp, #0x98 - bl func_01ff9bc4 + bl Vec3p_Add _0211857c: ldr r1, [r8, #0x98] add r0, sp, #0x8c mov r9, r1, asr #0x1 - bl func_01ff9cec + bl Vec3p_Length mov r10, r0 add r0, sp, #0xa4 add r4, sp, #0x20 @@ -6806,7 +6806,7 @@ _021185d8: mov r2, r7 mov r3, r7 sub r10, r10, r9 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, _0211880c ; =0x0000ffff strh r6, [sp, #0xf4] strh r0, [sp, #0xec] @@ -6854,7 +6854,7 @@ _021185d8: add r0, sp, #0x38 mov r1, r7 mov r2, r4 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp, #0xc8] ldr r0, [sp, #0xcc] str r1, [sp, #0x68] @@ -6876,7 +6876,7 @@ _021185d8: beq _02118740 mov r0, r4 add r1, sp, #0x80 - bl func_01ff9c2c + bl Vec3p_Dot ldr r1, _02118810 ; =0xfffff0f7 cmp r0, r1 movlt r10, #0 @@ -27846,25 +27846,25 @@ func_ov12_02129760: ; 0x02129760 add r2, sp, #0xc mov r7, r3 add r6, r5, r4 - bl func_01ff9bf8 + bl Vec3p_Sub add r2, sp, #0 mov r0, r8 mov r1, r7 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot movs r5, r0 addeq sp, sp, #0x18 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} add r0, sp, #0xc add r1, sp, #0 - bl func_01ff9c2c + bl Vec3p_Dot mov r4, r0 add r0, sp, #0xc mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot smull r2, r1, r4, r4 adds ip, r2, #0x800 smull r2, r3, r6, r6 @@ -27978,7 +27978,7 @@ func_ov12_021298d0: ; 0x021298d0 str r3, [sp, #0xd4] ldr r3, [r4, #0x68] str r3, [sp, #0xd8] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [r5, #0x88] ldr r0, [sp, #0xf4] str r1, [sp, #0xc0] @@ -28014,12 +28014,12 @@ func_ov12_021298d0: ; 0x021298d0 add r1, sp, #0xd0 add r2, sp, #0xe8 add r3, sp, #0x8c - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, [sp, #4] add r1, sp, #0xdc mov r2, r7 add r3, sp, #0x98 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [r5, #0x4c] ldr r0, [sp, #0x98] str r1, [sp, #0x9c] @@ -28053,14 +28053,14 @@ _02129a28: str r3, [sp, #0x78] ldr r3, [r4, #0x50] str r3, [sp, #0x7c] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [sp, #0x6c] ldr r2, [r5, #0x88] ldr r1, [r4, #0x88] add r0, sp, #0x68 add r6, r2, r1 - bl func_01ff9cec + bl Vec3p_Length mov r8, r0 cmp r8, r6 bge _02129b78 @@ -28105,12 +28105,12 @@ _02129ad0: rsb r0, r0, #0 add r1, sp, #0x5c mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy add r2, sp, #0x74 mov r0, r7 add r1, sp, #0x5c mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, [sp, #0x80] str r0, [r5, #0x48] ldr r0, [sp, #0x84] @@ -28161,7 +28161,7 @@ _02129bcc: str r3, [sp, #0x48] ldr r3, [r4, #0x50] str r3, [sp, #0x4c] - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0x38 str r1, [sp, #0x3c] @@ -28196,10 +28196,10 @@ _02129bcc: mov r0, r8 add r1, sp, #0x20 add r2, sp, #0x14 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x38 add r1, sp, #0x14 - bl func_01ff9c2c + bl Vec3p_Dot mov r8, r0 cmp r8, #0 addle sp, sp, #0x100 @@ -28219,11 +28219,11 @@ _02129bcc: mov r9, r0 add r0, sp, #0xd0 mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot mov r10, r0 add r0, sp, #0xdc mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, r10 movgt r0, #1 movle r0, #0 @@ -28260,12 +28260,12 @@ _02129d7c: add r1, sp, #8 mov r3, r2 rsb r0, r8, #0 - bl func_01ff9e64 + bl Vec3p_Axpy add r2, sp, #0xd0 add r1, sp, #8 mov r0, r9 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, [sp, #0xdc] str r0, [r5, #0x60] ldr r0, [sp, #0xe0] @@ -29004,7 +29004,7 @@ _0212a6cc: add r0, r6, #0x48 add r1, r6, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add _0212a740: ldr r1, [r6, #0x48] ldr r0, _0212a9ec ; =gMapManager @@ -29229,7 +29229,7 @@ _0212aa30: mov r1, r4 mov r2, r5 add r0, r6, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] cmp r0, #0 ldreq r0, [sp, #8] @@ -30749,11 +30749,11 @@ _0212bd7c: ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} mov r0, r3 - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x29 blt _0212be6c add r0, sp, #0x10 - bl func_01ff9cec + bl Vec3p_Length ldr r1, _0212bf0c ; =0x0000028f cmp r0, r1 bge _0212be6c @@ -30792,7 +30792,7 @@ _0212bd7c: add r0, sp, #0x28 add r1, r4, #0x1c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0x10] str r0, [r4, #0x28] ldr r0, [sp, #0x14] @@ -30804,7 +30804,7 @@ _0212be6c: add r0, sp, #0x28 add r1, r4, #0x1c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x1c] str r0, [r4, #0x28] ldr r0, [r4, #0x20] @@ -30858,26 +30858,26 @@ func_ov12_0212bf14: ; 0x0212bf14 mov r6, r1 mov r4, r0 mov r7, r3 - bl func_01ff9bf8 + bl Vec3p_Sub add r2, sp, #0 mov r0, r5 mov r1, r6 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp, #0x38] add r0, sp, #0 bl func_01fffbec add r0, sp, #0xc - bl func_01ff9cec + bl Vec3p_Length mov r6, r0 add r0, sp, #0xc add r1, sp, #0 - bl func_01ff9c2c + bl Vec3p_Dot mov r1, r6 bl Divide mov r5, r0 add r0, sp, #0xc mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r3, [sp, #0x30] sub r2, r7, r6 smull lr, ip, r3, r2 @@ -30903,7 +30903,7 @@ func_ov12_0212bf14: ; 0x0212bf14 mov r0, r4 mov r2, r4 add r1, sp, #0xc - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end func_ov12_0212bf14 @@ -34604,7 +34604,7 @@ _0212ed88: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 mov r0, r5 strb r1, [r5, #0x165] @@ -35756,17 +35756,17 @@ _0212fc68: add r0, r4, #0x18 add r1, sp, #0x30 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x54 mov r1, #0x258 strh r1, [r4, #0x66] add r1, sp, #0x3c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x48 add r1, sp, #0x3c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #7 @@ -35921,7 +35921,7 @@ _0212fee4: mov r0, r3 mov r2, r3 add r1, r5, #0xcc - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0213002c ; =data_027e0e58 add r8, r5, #0xb4 ldr r6, [r0] @@ -36210,7 +36210,7 @@ func_ov12_0213024c: ; 0x0213024c add r0, sp, #0x80 add r1, sp, #0x74 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0x29 str r0, [sp] mov r0, #5 diff --git a/asm/ov14/Actor/ActorRupee.inc b/asm/ov14/Actor/ActorRupee.inc index 0826c7f1..02a996eb 100644 --- a/asm/ov14/Actor/ActorRupee.inc +++ b/asm/ov14/Actor/ActorRupee.inc @@ -61,7 +61,7 @@ .extern data_027e0fe0 .extern data_ov00_020e9370 .extern data_ov00_020eec9c -.extern func_01ff9bc4 +.extern Vec3p_Add .extern func_01fffd04 .extern func_0202bc38 .extern func_ov00_0207a13c diff --git a/asm/ov14/Actor/ActorRupee.s b/asm/ov14/Actor/ActorRupee.s index 51eaf441..10cb44f9 100644 --- a/asm/ov14/Actor/ActorRupee.s +++ b/asm/ov14/Actor/ActorRupee.s @@ -221,7 +221,7 @@ _ZN10ActorRupee4MoveEv: ; 0x0213b120 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #1 strb r0, [r4, #0x9f] ldr r0, [r4, #0x98] diff --git a/asm/ov14/ov14_0211f640.inc b/asm/ov14/ov14_0211f640.inc index 3f91a0a4..466c7412 100644 --- a/asm/ov14/ov14_0211f640.inc +++ b/asm/ov14/ov14_0211f640.inc @@ -206,12 +206,12 @@ .extern func_01ff8aa0 .extern func_01ff9158 .extern func_01ff9958 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c2c -.extern func_01ff9cec -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Dot +.extern Vec3p_Length +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffa9fc diff --git a/asm/ov14/ov14_0211f640.s b/asm/ov14/ov14_0211f640.s index 73975718..e6cdda0f 100644 --- a/asm/ov14/ov14_0211f640.s +++ b/asm/ov14/ov14_0211f640.s @@ -806,7 +806,7 @@ func_ov14_0211ff04: ; 0x0211ff04 orr r1, r1, r0, lsl #20 str r1, [r4, #0x68] add r0, r4, #0x60 - bl func_01ff9cec + bl Vec3p_Length mov r3, #0 str r0, [r4, #0x1a0] str r3, [r4, #0x19c] @@ -959,11 +959,11 @@ func_ov14_02120180: ; 0x02120180 add r2, sp, #0x3c add r0, r4, #0x54 add r1, r4, #0x7c - bl func_01ff9bc4 + bl Vec3p_Add add r2, sp, #0x30 add r0, r4, #0x48 add r1, r4, #0x7c - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x60 str r0, [sp] mov r0, #1 @@ -1128,7 +1128,7 @@ _021203e0: add r0, r6, #0x48 add r1, r6, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldrb r0, [r6, #0x188] cmp r0, #0 ldreqb r0, [r6, #0x189] @@ -1271,7 +1271,7 @@ _021205e8: add r1, r6, #0x60 mov r2, r0 strh r4, [r3, #0xac] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r6 bl _ZN5Actor12ApplyGravityEv b _02120720 @@ -1302,7 +1302,7 @@ _02120618: add r0, sp, #8 add r1, r4, #0x48 add r2, r6, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add b _02120710 _02120688: ldrh r1, [r6, #0x78] @@ -1453,18 +1453,18 @@ func_ov14_021207b8: ; 0x021207b8 add r1, sp, #0x18 mov r2, r0 add r9, r6, r3 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot mov r7, r0 add r0, sp, #0 add r1, sp, #0xc - bl func_01ff9c2c + bl Vec3p_Dot mov r6, r0 add r0, sp, #0xc mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot smull r3, r2, r9, r9 smull r9, r1, r6, r6 adds ip, r9, #0x800 @@ -1491,7 +1491,7 @@ func_ov14_021207b8: ; 0x021207b8 add r2, r5, #0x48 add r1, r5, #0x60 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy b _02120930 _02120914: mov r1, r7 @@ -1500,12 +1500,12 @@ _02120914: add r2, r5, #0x48 add r1, r5, #0x60 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy _02120930: add r0, r5, #0x48 add r1, r8, #0x48 add r2, r5, #0x158 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r5, #0x1a4] add r0, r0, r4 str r0, [r5, #0x1a4] @@ -1572,7 +1572,7 @@ func_ov14_02120998: ; 0x02120998 add r1, r3, #0x48 add r2, r6, #0x158 str r4, [r6, #0x5c] - bl func_01ff9bf8 + bl Vec3p_Sub _02120a30: ldr r2, _02120a78 ; =0x00001555 add r1, r6, #0x100 @@ -1652,7 +1652,7 @@ func_ov14_02120ac4: ; 0x02120ac4 bl func_ov00_020a61ac add r0, sp, #0x20 add r1, sp, #0x2c - bl func_01ff9c2c + bl Vec3p_Dot mov r3, #0x1800 rsb r3, r3, #0 mvn ip, #0 @@ -1667,7 +1667,7 @@ func_ov14_02120ac4: ; 0x02120ac4 orr r0, r0, r3, lsl #20 add r1, sp, #0x2c mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy add r0, sp, #0x14 mov r1, #0x400 bl func_01fffbec @@ -1753,7 +1753,7 @@ func_ov14_02120c98: ; 0x02120c98 mov r0, r1 add r2, sp, #0 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -1908,7 +1908,7 @@ _02120e94: ldr r1, _02120ed0 ; =gPlayerPos add r2, sp, #0 add r0, r4, #0x54 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -2230,7 +2230,7 @@ _02121354: add r2, sp, #0x60 add r0, r8, #0x48 add r1, r8, #0x8c - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, _021213c0 ; =0x00000666 mov r0, r7, asr #0x1 str r1, [sp] @@ -3486,7 +3486,7 @@ _02122420: add r1, sp, #0x80 mov r2, r0 str r3, [sp, #0x84] - bl func_01ff9bc4 + bl Vec3p_Add b _02122510 _02122488: ldr r0, [sp, #0x80] @@ -3529,11 +3529,11 @@ _02122510: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r5, #0x48 add r1, r5, #0x254 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, _02122ae8 ; =data_027e0d0c mov r0, r5 ldr r3, [r2] @@ -3589,7 +3589,7 @@ _021225cc: ldr r0, [sp, #8] add r1, r5, #0x48 add r0, r0, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x68] ldr r1, [sp, #0x70] bl func_01ffa0f4 @@ -3640,7 +3640,7 @@ _021226a4: beq _0212276c add r0, r5, #0x60 add r1, r5, #0xc4 - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 bge _02122820 mov r1, #0x1200 @@ -3657,7 +3657,7 @@ _021226a4: orr r0, r0, r1, lsl #20 add r1, r5, #0xc4 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r2, [r5, #0x60] mov r0, #0xc00 umull r6, r3, r2, r0 @@ -3808,9 +3808,9 @@ _02122938: add r2, sp, #0x50 add r0, r5, #0x248 add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x50 - bl func_01ff9cec + bl Vec3p_Length ldr r1, _02122b00 ; =0x00000666 cmp r0, r1 bge _02122974 @@ -3827,7 +3827,7 @@ _02122974: add r1, sp, #0x50 mov r3, r2 mov r0, #0x400 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [r5, #0x60] ldr r3, _02122b04 ; =0x0000099a add r0, r5, #0x48 @@ -3847,7 +3847,7 @@ _02122974: add r3, r3, #0x800 mov r3, r3, asr #0xc str r3, [r5, #0x68] - bl func_01ff9bc4 + bl Vec3p_Add _021229e0: cmp r4, #0 beq _02122a84 @@ -3863,13 +3863,13 @@ _021229e0: ldr r1, [r5, #0x244] add r3, sp, #0x44 add r2, r5, #0x48 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [r5, #0x244] ldr r0, [r5, #0x260] add r3, sp, #0x38 add r1, r1, #0xc add r2, r5, #0x48 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, _02122b08 ; =data_027e0e58 add r2, sp, #0x44 ldr r0, [r0] @@ -4056,13 +4056,13 @@ _02122c98: .word data_027e0e58 .global func_ov14_02122c9c arm_func_start func_ov14_02122c9c func_ov14_02122c9c: ; 0x02122c9c - ldr ip, _02122cb0 ; =func_01ff9bc4 + ldr ip, _02122cb0 ; =Vec3p_Add mov r2, r0 add r0, r2, #0x254 add r2, r2, #0x254 bx ip .align 2, 0 -_02122cb0: .word func_01ff9bc4 +_02122cb0: .word Vec3p_Add arm_func_end func_ov14_02122c9c .global func_ov14_02122cb4 @@ -4126,7 +4126,7 @@ func_ov14_02122d6c: ; 0x02122d6c mov r4, r1 mov r5, r0 mov r0, r4 - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x29 ble _02122db4 ldr r0, _02122e40 ; =gPlayerPos @@ -4261,9 +4261,9 @@ func_ov14_02122ed4: ; 0x02122ed4 str r3, [sp, #0x40] ldr r3, [r10, #0x5c] str r3, [sp, #0x44] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x30 - bl func_01ff9cec + bl Vec3p_Length add r1, sp, #0x3c mov r9, r0 add r11, sp, #0 @@ -4294,7 +4294,7 @@ _02122f90: mov r1, r6 mov r2, r5 mov r3, r5 - bl func_01ff9e64 + bl Vec3p_Axpy sub r9, r9, r8 b _02122fcc _02122fb4: @@ -4302,7 +4302,7 @@ _02122fb4: mov r1, r6 mov r2, r5 mov r3, r5 - bl func_01ff9e64 + bl Vec3p_Axpy mov r9, r4 _02122fcc: ldr r1, [sp, #0x18] @@ -4572,7 +4572,7 @@ _021232b8: ldr r3, [r5, #0x50] mov r2, r0 str r3, [r5, #0x5c] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02123554 ; =gPlayerLink add r1, r5, #0x48 ldr r0, [r0] @@ -4643,7 +4643,7 @@ _02123394: ldr r3, [r5, #0x50] mov r2, r0 str r3, [sp, #0x18] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, _02123558 ; =gPlayer add r1, sp, #0x28 ldr r0, [r0] @@ -4651,7 +4651,7 @@ _02123394: ldr r2, [r2, #0x10] blx r2 add r0, sp, #0x38 - bl func_01ff9cec + bl Vec3p_Length ldr r1, [sp, #0x34] cmp r0, r1 bge _02123460 @@ -4787,7 +4787,7 @@ func_ov14_021235bc: ; 0x021235bc mov r0, r1 add r2, sp, #0 add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr ip, [r5, #0x60] cmp ip, #0 blt _02123610 @@ -4860,7 +4860,7 @@ _021236d4: cmp r4, #0 beq _02123718 add r0, r5, #0x60 - bl func_01ff9cec + bl Vec3p_Length mov r1, r0 add r0, sp, #0 add r1, r1, #0x200 @@ -4880,7 +4880,7 @@ _02123718: add r1, r5, #0x60 add r0, sp, #0 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r4, r5, pc} arm_func_end func_ov14_021235bc @@ -5171,7 +5171,7 @@ _02123a80: add r0, r6, #0x48 add r1, r6, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 add r1, r6, #0x180 bl func_ov14_0213d404 @@ -5331,7 +5331,7 @@ _02123cbc: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldmia sp!, {r4, r5, r6, pc} arm_func_end func_ov14_02123c54 @@ -5345,7 +5345,7 @@ func_ov14_02123cd0: ; 0x02123cd0 mov r0, r1 add r2, sp, #0 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub cmp r5, #0 beq _02123d9c ldr lr, [sp] @@ -5998,7 +5998,7 @@ _0212453c: add r2, sp, #0xa4 add r0, r5, #0x158 add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r2, #0 ldr r1, _02124c58 ; =0x00000333 add r0, sp, #0xa4 @@ -6058,7 +6058,7 @@ _02124608: add r0, sp, #0x98 add r2, sp, #0x8c add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r2, #0 ldr r1, _02124c58 ; =0x00000333 add r0, sp, #0x8c @@ -6122,7 +6122,7 @@ _02124724: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r5, #0x60] ldr r1, [r5, #0x68] bl func_01ffa0f4 @@ -6248,7 +6248,7 @@ _021248a8: bne _02124920 add r0, r5, #0x60 add r1, r5, #0xc4 - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 bgt _02124944 _02124920: @@ -7079,7 +7079,7 @@ _02125340: mov r2, r4 str r3, [sp, #0x20] str r3, [sp, #0x28] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0x800 mov r1, #0x1000 str r1, [sp, #0x18] @@ -7088,7 +7088,7 @@ _02125340: add r0, sp, #0x44 add r1, sp, #0x14 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02125598 ; =gMapManager ldrb r3, [r5, #0x15] ldrb r2, [r5, #0x14] @@ -8593,7 +8593,7 @@ func_ov14_0212652c: ; 0x0212652c add r0, sp, #0x40 add r1, sp, #0x34 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #4 str r0, [sp] ldr r0, _021265ec ; =data_027e0e58 @@ -8864,7 +8864,7 @@ _02126898: str lr, [sp, #0x48] str ip, [sp, #0x4c] str r3, [sp, #0x50] - bl func_01ff9bf8 + bl Vec3p_Sub ldr lr, _02126ab0 ; =0x0000059a add r0, sp, #0x54 rsb ip, lr, #0x2c00 @@ -8874,7 +8874,7 @@ _02126898: str lr, [sp, #0x3c] str ip, [sp, #0x40] str r3, [sp, #0x44] - bl func_01ff9bc4 + bl Vec3p_Add mov r2, #1 strb r2, [r5, #0x83] ldrb r1, [r5, #0x15] @@ -8917,7 +8917,7 @@ _02126958: str lr, [sp, #0x30] str ip, [sp, #0x34] str r3, [sp, #0x38] - bl func_01ff9bf8 + bl Vec3p_Sub ldr ip, _02126ab8 ; =0x00002666 add r0, sp, #0x54 rsb r3, ip, #0x2c00 @@ -8927,7 +8927,7 @@ _02126958: str lr, [sp, #0x24] str ip, [sp, #0x28] str r3, [sp, #0x2c] - bl func_01ff9bc4 + bl Vec3p_Add ldrb r1, [r5, #0x14] ldr r0, _02126ab4 ; =gMapManager ldrb ip, [r5, #0x15] @@ -10194,7 +10194,7 @@ func_ov14_02127ae4: ; 0x02127ae4 add r1, sp, #0xc mov r0, r5 mov r2, r5 - bl func_01ff9bc4 + bl Vec3p_Add ldrsh r0, [r6, #0xc] add sp, sp, #0x18 strh r0, [r4] @@ -10216,7 +10216,7 @@ _02127b58: add r1, sp, #0 mov r0, r5 mov r2, r5 - bl func_01ff9bc4 + bl Vec3p_Add ldrsh r0, [r6, #0xc] sub r0, r0, #0x8000 strh r0, [r4] @@ -10651,11 +10651,11 @@ func_ov14_02127f84: ; 0x02127f84 add r0, sp, #0x6c add r1, sp, #0 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x6c add r1, sp, #0xc add r2, sp, #0x54 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp] ldr r1, [sp, #0xc] rsb r0, r0, #0 @@ -10665,11 +10665,11 @@ func_ov14_02127f84: ; 0x02127f84 add r1, sp, #0 mov r2, r0 str r3, [sp, #0xc] - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x60 add r1, sp, #0xc add r2, sp, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x9c] cmp r0, #0 beq _021280dc @@ -11678,7 +11678,7 @@ func_ov14_02128e28: ; 0x02128e28 str r1, [sp, #0xe8] add r1, r5, #0x18 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r5, #0x90 ldr r3, [r0] add r1, sp, #0x130 @@ -11688,7 +11688,7 @@ func_ov14_02128e28: ; 0x02128e28 add r0, sp, #0xe8 add r1, r5, #0x18 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [sp, #0xf4] str r0, [sp, #0xf8] @@ -11701,7 +11701,7 @@ func_ov14_02128e28: ; 0x02128e28 add r0, sp, #0xf4 add r1, sp, #0xe8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 add r1, sp, #0x130 add r2, sp, #0xf4 @@ -11742,7 +11742,7 @@ _02128f5c: str r4, [sp, #0x100] str r3, [sp, #0x104] str r3, [sp, #0x108] - bl func_01ff9bc4 + bl Vec3p_Add add r0, r5, #0x90 ldr r3, [r0] add r1, sp, #0x10c @@ -11761,7 +11761,7 @@ _02128f5c: add r0, sp, #0xe8 add r1, r5, #0x18 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 mov r1, r4 str r1, [sp, #0xac] @@ -11770,7 +11770,7 @@ _02128f5c: add r0, sp, #0xe8 add r1, sp, #0xac mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 add r1, sp, #0x10c add r2, sp, #0xe8 @@ -11805,7 +11805,7 @@ _02128f5c: str lr, [sp, #0xa0] str ip, [sp, #0xa4] str r3, [sp, #0xa8] - bl func_01ff9bc4 + bl Vec3p_Add add r0, r5, #0xb8 ldr r1, [r0] ldr r1, [r1, #8] @@ -12275,11 +12275,11 @@ func_ov14_02129674: ; 0x02129674 add r0, sp, #0x6c add r1, sp, #0 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x6c add r1, sp, #0xc add r2, sp, #0x54 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp] ldr r1, [sp, #0xc] rsb r0, r0, #0 @@ -12289,11 +12289,11 @@ func_ov14_02129674: ; 0x02129674 add r1, sp, #0 mov r2, r0 str r3, [sp, #0xc] - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x60 add r1, sp, #0xc add r2, sp, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x9c] cmp r0, #0 beq _021297cc @@ -12783,7 +12783,7 @@ _02129d80: str lr, [sp, #0x3c] str ip, [sp, #0x40] str r3, [sp, #0x44] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x48 ldr lr, _02129e64 ; =0x0000059a mov ip, #0x3000 @@ -12793,7 +12793,7 @@ _02129d80: str lr, [sp, #0x30] str ip, [sp, #0x34] str r3, [sp, #0x38] - bl func_01ff9bc4 + bl Vec3p_Add b _02129e24 _02129dd4: add r0, sp, #0x54 @@ -12805,7 +12805,7 @@ _02129dd4: str lr, [sp, #0x24] str ip, [sp, #0x28] str r3, [sp, #0x2c] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x48 ldr r3, _02129e64 ; =0x0000059a mov lr, #0x1000 @@ -12815,7 +12815,7 @@ _02129dd4: str lr, [sp, #0x18] str ip, [sp, #0x1c] str r3, [sp, #0x20] - bl func_01ff9bc4 + bl Vec3p_Add _02129e24: add r0, sp, #0x54 add ip, sp, #0 @@ -13222,7 +13222,7 @@ func_ov14_0212a2c0: ; 0x0212a2c0 str ip, [sp, #0xc] str r3, [sp, #0x10] str r3, [sp, #0x14] - bl func_01ff9bc4 + bl Vec3p_Add mov r3, #0 add r0, sp, #0x6c mov ip, #0x1000 @@ -13231,7 +13231,7 @@ func_ov14_0212a2c0: ; 0x0212a2c0 str ip, [sp] str r3, [sp, #4] str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add ldrb r0, [r4, #0x82] cmp r0, #0 ldr r0, [r4, #0x68] @@ -13280,14 +13280,14 @@ _0212a390: add r0, sp, #0x78 add r1, sp, #0x18 add r2, sp, #0x60 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #0x18] add r0, sp, #0x6c rsb r3, r1, #0 add r1, sp, #0x18 add r2, sp, #0x54 str r3, [sp, #0x18] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x9c] cmp r0, #0 beq _0212a430 @@ -13330,10 +13330,10 @@ func_ov14_0212a460: ; 0x0212a460 add r0, sp, #0x20 add r1, sp, #0x2c add r2, sp, #0x14 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x14 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize mov r0, #0x1000 ldr r2, [sp, #0x30] rsb r0, r0, #0 @@ -13356,16 +13356,16 @@ func_ov14_0212a460: ; 0x0212a460 mov r0, r7 add r1, sp, #0x14 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy add r2, sp, #0x2c mov r0, r6 add r1, sp, #0x14 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy add r0, sp, #0x20 add r1, sp, #0x2c add r2, sp, #0x14 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r2, [sp, #0x2c] ldr r1, [sp, #0x30] str r2, [sp, #4] @@ -13395,7 +13395,7 @@ func_ov14_0212a460: ; 0x0212a460 mov r3, r4 str r0, [r4, #8] ldr r0, [sp] - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, #1 add sp, sp, #0x38 ldmia sp!, {r3, r4, r5, r6, r7, pc} @@ -13552,7 +13552,7 @@ func_ov14_0212a758: ; 0x0212a758 add r1, sp, #0x44 str r3, [sp, #0x44] mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #4] mov r3, #0 orr r0, r0, #4 @@ -13588,7 +13588,7 @@ func_ov14_0212a758: ; 0x0212a758 str ip, [sp, #0x2c] str r3, [sp, #0x30] str r5, [sp, #0x34] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x50 ldr r3, _0212a918 ; =0x000002cd mov ip, #0x800 @@ -13598,7 +13598,7 @@ func_ov14_0212a758: ; 0x0212a758 str ip, [sp, #0x20] str r5, [sp, #0x24] str r3, [sp, #0x28] - bl func_01ff9bc4 + bl Vec3p_Add mov r5, #0 bic r1, r5, #0x1f orr r1, r1, #7 @@ -13999,7 +13999,7 @@ func_ov14_0212acdc: ; 0x0212acdc str r3, [sp, #0x40] str r5, [sp, #0x50] str r5, [sp, #0x44] - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0x800 ldr r2, _0212ae98 ; =0x0000059a str r1, [sp, #0x24] @@ -14009,7 +14009,7 @@ func_ov14_0212acdc: ; 0x0212acdc str r2, [sp, #0x2c] add r1, sp, #0x24 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r6, #0 bic r0, r6, #0x1f orr r0, r0, #7 @@ -14442,7 +14442,7 @@ func_ov14_0212b31c: ; 0x0212b31c add r1, sp, #0x3c str r3, [sp, #0x3c] mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4, #0x18] add r0, sp, #0x54 str r1, [sp, #0x54] @@ -14464,7 +14464,7 @@ func_ov14_0212b31c: ; 0x0212b31c str lr, [sp, #0x30] str ip, [sp, #0x34] str r3, [sp, #0x38] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r3, _0212b4bc ; =0x000002cd mov r1, #0x800 mov r2, #0x1000 @@ -14474,7 +14474,7 @@ func_ov14_0212b31c: ; 0x0212b31c add r1, sp, #0x24 mov r2, r0 str r3, [sp, #0x2c] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 ldrh r1, [r4, #0x24] bic r0, r0, #0x1f @@ -14833,7 +14833,7 @@ func_ov14_0212b81c: ; 0x0212b81c str r4, [sp, #0x3c] str r3, [sp, #0x40] str r4, [sp, #0x44] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r7 bl func_ov14_0212ba74 ldr r1, [r7, #0x18] @@ -14858,7 +14858,7 @@ func_ov14_0212b81c: ; 0x0212b81c str r6, [sp, #0x50] str r4, [sp, #0x30] str r3, [sp, #0x38] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r4 str r0, [sp, #0x24] str r0, [sp, #0x28] @@ -14867,7 +14867,7 @@ func_ov14_0212b81c: ; 0x0212b81c add r0, sp, #0x48 add r1, sp, #0x24 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r4, #0 bic r0, r4, #0x1f orr r0, r0, #7 @@ -16089,7 +16089,7 @@ func_ov14_0212c7c0: ; 0x0212c7c0 str ip, [sp, #0x14] str r3, [sp, #0x18] str ip, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0x800 add r0, sp, #0x38 str r1, [sp, #8] @@ -16098,7 +16098,7 @@ func_ov14_0212c7c0: ; 0x0212c7c0 str r1, [sp, #0xc] add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #8 @@ -16510,7 +16510,7 @@ func_ov14_0212cd08: ; 0x0212cd08 str ip, [sp, #0x14] str r3, [sp, #0x18] str ip, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _0212ce50 ; =0x00000666 add r0, sp, #0x38 str r1, [sp, #8] @@ -16519,7 +16519,7 @@ func_ov14_0212cd08: ; 0x0212cd08 str r1, [sp, #0xc] add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #6 @@ -16955,7 +16955,7 @@ func_ov14_0212d2ec: ; 0x0212d2ec str r1, [r4, #0x74] add r1, r4, #0x70 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4, #0x68] ldr r0, _0212d37c ; =0xfffff333 cmp r1, r0 @@ -17282,7 +17282,7 @@ func_ov14_0212d6b0: ; 0x0212d6b0 str ip, [sp, #0x14] str r3, [sp, #0x18] str ip, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _0212d7b0 ; =0x00000666 ldr r2, _0212d7b4 ; =0x00000ccd add r0, sp, #0x38 @@ -17291,7 +17291,7 @@ func_ov14_0212d6b0: ; 0x0212d6b0 str r1, [sp, #0x10] add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #7 @@ -18460,7 +18460,7 @@ func_ov14_0212e558: ; 0x0212e558 str ip, [sp, #0x28] str r3, [sp, #0x2c] str r3, [sp, #0x30] - bl func_01ff9bc4 + bl Vec3p_Add b _0212e608 _0212e5ec: add r0, r4, #0x18 @@ -18469,7 +18469,7 @@ _0212e5ec: str r3, [sp, #0x1c] str r3, [sp, #0x20] str r3, [sp, #0x24] - bl func_01ff9bc4 + bl Vec3p_Add _0212e608: ldr r0, [r4, #0x18] mov r1, #0 @@ -19561,7 +19561,7 @@ _0212f458: str r5, [sp, #0x14] str r3, [sp, #0x18] str r2, [sp, #0x1c] - bl func_01ff9d4c + bl Vec3p_Normalize ldr r0, _0212f55c ; =0x48415254 cmp r4, r0 bne _0212f4cc @@ -19575,7 +19575,7 @@ _0212f458: add r0, sp, #0x20 add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add _0212f4cc: ldr r1, _0212f564 ; =0x0000019a add r0, sp, #0x14 @@ -19864,7 +19864,7 @@ _0212f84c: str r3, [sp, #0x18] str r8, [sp, #0x1c] str r3, [sp, #0x20] - bl func_01ff9bf8 + bl Vec3p_Sub mov r2, #0x800 ldr r1, _0212fb18 ; =0x00001333 add r0, sp, #0x50 @@ -19873,7 +19873,7 @@ _0212f84c: str r2, [sp, #0x14] add r1, sp, #0xc mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r6 add r6, sp, #0x38 ldmia r0, {r0, r1, r2} @@ -21116,7 +21116,7 @@ func_ov14_0213089c: ; 0x0213089c str r2, [sp, #0x1c] mov r0, ip mov r2, ip - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0x800 ldr r1, _021309b8 ; =0x00001334 str r0, [sp, #8] @@ -21125,7 +21125,7 @@ func_ov14_0213089c: ; 0x0213089c str r1, [sp, #0xc] add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #0x20000009 @@ -21649,7 +21649,7 @@ _02130ff8: mov r0, r5 mov r2, r5 str r3, [r6, #4] - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -22597,7 +22597,7 @@ func_ov14_02131c54: ; 0x02131c54 str ip, [sp, #0x2c] str r3, [sp, #0x30] str ip, [sp, #0x34] - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0x800 add r0, sp, #0x38 str r1, [sp, #0x20] @@ -22605,7 +22605,7 @@ func_ov14_02131c54: ; 0x02131c54 str r1, [sp, #0x28] add r1, sp, #0x20 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #9 @@ -24050,7 +24050,7 @@ func_ov14_02132f48: ; 0x02132f48 str ip, [sp, #0x14] str r3, [sp, #0x18] str ip, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0x800 ldr r2, _02133044 ; =0x00001333 add r0, sp, #0x38 @@ -24059,7 +24059,7 @@ func_ov14_02132f48: ; 0x02132f48 str r1, [sp, #0x10] add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x44 add lr, sp, #0x20 ldmia r0, {r0, r1, r2} @@ -24828,7 +24828,7 @@ func_ov14_021339bc: ; 0x021339bc str ip, [sp, #0x14] str r3, [sp, #0x18] str ip, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub mov r2, #0x800 ldr r1, _02133c50 ; =0x00002666 add r0, sp, #0x44 @@ -24837,7 +24837,7 @@ func_ov14_021339bc: ; 0x021339bc str r2, [sp, #0x10] add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #7 @@ -25690,7 +25690,7 @@ func_ov14_02134554: ; 0x02134554 str ip, [sp, #0x14] str r3, [sp, #0x18] str ip, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0x800 add r0, sp, #0x38 str r1, [sp, #8] @@ -25699,7 +25699,7 @@ func_ov14_02134554: ; 0x02134554 str r1, [sp, #0xc] add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #7 @@ -26159,7 +26159,7 @@ _02134b84: str r7, [sp, #0x18] str r6, [sp, #0x1c] str r3, [sp, #0x20] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [r10, #0x60] str r0, [r10, #0x64] @@ -26590,7 +26590,7 @@ _021350d4: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 mov r1, #0 bl func_01fffd04 @@ -27655,11 +27655,11 @@ func_ov14_02135dd8: ; 0x02135dd8 str r3, [sp] str r3, [sp, #4] str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0xc add r1, sp, #0 add r2, r4, #0xc - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0x1c ldmia sp!, {r3, r4, pc} arm_func_end func_ov14_02135dd8 @@ -28088,7 +28088,7 @@ _021363a4: add r0, r6, #0x48 add r1, r6, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r6 mov r1, r4 bl func_01fffd04 @@ -28228,7 +28228,7 @@ _0213657c: mla r3, r1, r11, r4 mov r2, r6 add r1, r3, r7 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r8] cmp r0, #0 beq _021365e8 @@ -28350,7 +28350,7 @@ func_ov14_021366e4: ; 0x021366e4 str ip, [sp, #0x24] str r3, [sp, #0x28] str ip, [sp, #0x2c] - bl func_01ff9bf8 + bl Vec3p_Sub mov ip, #0x800 add r0, sp, #0x48 mov r3, #0x1000 @@ -28359,7 +28359,7 @@ func_ov14_021366e4: ; 0x021366e4 str ip, [sp, #0x18] str r3, [sp, #0x1c] str ip, [sp, #0x20] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, _021368c4 ; =gMapManager add r0, sp, #8 ldr r1, [r1] @@ -28700,11 +28700,11 @@ _02136c04: add r0, sp, #0x34 add r1, r4, #0x1b8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x28 add r1, r4, #0x1b8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x34 add lr, sp, #0x10 ldmia r0, {r0, r1, r2} @@ -28795,7 +28795,7 @@ func_ov14_02136d20: ; 0x02136d20 ldr r3, [r4, #0x50] add r1, r4, #0x1c4 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02136de4 ; =data_027e0e58 add r8, r4, #0x210 ldr r6, [r0] @@ -28984,11 +28984,11 @@ _02136fb8: str r5, [sp, #0x48] str r3, [sp, #0x4c] str r5, [sp, #0x50] - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x48 add r1, r4, #0x1b8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x54 add r3, sp, #0x30 ldmia r0, {r0, r1, r2} @@ -29135,7 +29135,7 @@ _021371e0: ldr r3, [r4, #0x50] add r1, r4, #0x1c4 str r3, [sp, #0x2c] - bl func_01ff9bc4 + bl Vec3p_Add add r2, r4, #0x210 add r1, r4, #0x228 cmp r2, r1 @@ -30756,7 +30756,7 @@ _021386a0: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x28 mov r1, r5 bl _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_ @@ -33244,7 +33244,7 @@ _0213a640: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 mov r1, #0 bl func_01fffd04 @@ -33282,7 +33282,7 @@ _0213a68c: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 mov r1, #0 bl func_01fffd04 @@ -33580,7 +33580,7 @@ func_ov14_0213aa68: ; 0x0213aa68 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 mov r1, #0 bl func_01fffd04 diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index 9e1d67bf..a9a8b32d 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -228,11 +228,11 @@ .extern func_01ff991c .extern func_01ff9958 .extern func_01ff9b4c -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c2c -.extern func_01ff9cec -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Dot +.extern Vec3p_Length +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffa9fc diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s index 25694f8f..8464ceb7 100644 --- a/asm/ov14/ov14_0213b778.s +++ b/asm/ov14/ov14_0213b778.s @@ -490,7 +490,7 @@ func_ov14_0213bd4c: ; 0x0213bd4c str ip, [sp, #0x14] str r3, [sp, #0x18] str ip, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _0213be4c ; =0x00000666 ldr r2, _0213be50 ; =0x00000ccd add r0, sp, #0x38 @@ -499,7 +499,7 @@ func_ov14_0213bd4c: ; 0x0213bd4c str r1, [sp, #0x10] add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #7 @@ -2924,7 +2924,7 @@ _0213d8a0: add r0, sp, #0 mov r1, r7 mov r2, r4 - bl func_01ff9bf8 + bl Vec3p_Sub ldrsb r0, [r7, #0x19] ldr r1, [r6, #0x74] cmp r0, #0 @@ -3188,9 +3188,9 @@ func_ov14_0213dba4: ; 0x0213dba4 add r2, sp, #0x2c mov r0, r3 mov r1, lr - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x2c - bl func_01ff9cec + bl Vec3p_Length mov r2, r0 mov r0, #0x1000000 mov r1, #0 @@ -3220,14 +3220,14 @@ func_ov14_0213dba4: ; 0x0213dba4 str r2, [sp, #0x34] mov r0, r4 add r2, sp, #0x20 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x20 add r1, sp, #0x2c - bl func_01ff9c2c + bl Vec3p_Dot add r1, sp, #0x2c add r2, sp, #0x44 add r3, sp, #0x14 - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3581,10 +3581,10 @@ func_ov14_0213e144: ; 0x0213e144 mov r6, r1 mov r4, r3 str ip, [sp, #0x14] - bl func_01ff9bf8 + bl Vec3p_Sub add r1, sp, #0xc mov r0, r5 - bl func_01ff9c2c + bl Vec3p_Dot add r0, r0, #0x9a ldr r1, [r6, #0xc] add r0, r0, #0x100 @@ -3603,7 +3603,7 @@ func_ov14_0213e144: ; 0x0213e144 mov r1, r5 mov r2, r3 rsb r0, r0, r4, asr #12 - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, r7 bl func_ov14_0213d420 ldr r2, [sp] @@ -3655,7 +3655,7 @@ func_ov14_0213e20c: ; 0x0213e20c add r2, sp, #0xc mov r0, r7 add r1, r1, r6 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] bl func_01ffa0f4 @@ -4081,7 +4081,7 @@ _0213e788: mov r0, r9, lsr #0xc mov r2, r3 orr r0, r0, r7, lsl #20 - bl func_01ff9e64 + bl Vec3p_Axpy mov r1, #0 mov r0, #0x11 mov r2, r1 @@ -7944,7 +7944,7 @@ func_ov14_021415f4: ; 0x021415f4 mov r0, r5 add r1, r7, #0x1c add r2, r7, #0x190 - bl func_01ff9bc4 + bl Vec3p_Add ldrsh r1, [sp, #0x18] add r0, r7, #0x100 strh r1, [r0, #0x9c] @@ -8641,7 +8641,7 @@ _02141f38: str r7, [sp, #0x40] str r6, [sp, #0x44] str r3, [sp, #0x48] - bl func_01ff9bc4 + bl Vec3p_Add b _02142004 _02141f6c: mov r0, r4, asr #0x1 @@ -8655,7 +8655,7 @@ _02141f6c: str r7, [sp, #0x34] str r6, [sp, #0x38] str r3, [sp, #0x3c] - bl func_01ff9bc4 + bl Vec3p_Add b _02142004 _02141fa0: mov r0, r4, asr #0x1 @@ -8669,7 +8669,7 @@ _02141fa0: str r7, [sp, #0x28] str r6, [sp, #0x2c] str r3, [sp, #0x30] - bl func_01ff9bc4 + bl Vec3p_Add b _02142004 _02141fd4: mov r0, r4, asr #0x1 @@ -8683,7 +8683,7 @@ _02141fd4: str r7, [sp, #0x1c] str r6, [sp, #0x20] str r3, [sp, #0x24] - bl func_01ff9bc4 + bl Vec3p_Add _02142004: mov r0, #0 str r0, [r9, #0x74] @@ -9957,7 +9957,7 @@ func_ov14_02143018: ; 0x02143018 str r5, [sp, #0x1c] str lr, [sp, #0x20] str r5, [sp, #0x24] - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, r5 ldr r2, _0214317c ; =0x00000ccd add r0, sp, #0x40 @@ -9966,7 +9966,7 @@ func_ov14_02143018: ; 0x02143018 str r1, [sp, #0x18] add r1, sp, #0x10 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #7 @@ -10365,7 +10365,7 @@ func_ov14_02143588: ; 0x02143588 add r0, sp, #0x14 add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add _02143644: mov r1, #0 str r1, [sp] @@ -13050,12 +13050,12 @@ func_ov14_02145258: ; 0x02145258 add r0, sp, #0 add r1, r4, #0x1c4 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add _02145298: add r0, r4, #0x48 add r1, sp, #0 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r3, r4, pc} arm_func_end func_ov14_02145258 @@ -14515,7 +14515,7 @@ _021464f8: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x14 mov r1, r5 bl _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_ @@ -14566,7 +14566,7 @@ _021465d4: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add _021465e4: mov r1, r4 add r0, r5, #0xa4 @@ -18461,7 +18461,7 @@ _021498cc: ldr r3, [r4, #0x50] add r1, r4, #0x1c0 str r3, [sp, #0xc] - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #2 str r1, [sp] ldr r0, _02149960 ; =data_027e0e58 @@ -18817,7 +18817,7 @@ _02149cec: add r1, sp, #0x2c mov r0, ip mov r2, ip - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0x1000 str r0, [sp, #0x20] str r0, [sp, #0x28] @@ -18826,7 +18826,7 @@ _02149cec: str r0, [sp, #0x24] add r0, sp, #0x38 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x44 mov r3, #0 bic r3, r3, #0x1f @@ -20369,7 +20369,7 @@ _0214b188: add r1, sp, #0x24 mov r2, r0 str r3, [sp, #0x20] - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x18 mov r1, #0x800 bl func_01fffbec @@ -20612,7 +20612,7 @@ func_ov14_0214b484: ; 0x0214b484 str ip, [sp, #0x14] str r3, [sp, #0x18] str ip, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0x800 add r0, sp, #0x38 str r1, [sp, #8] @@ -20621,7 +20621,7 @@ func_ov14_0214b484: ; 0x0214b484 str r1, [sp, #0xc] add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #7 @@ -20686,7 +20686,7 @@ _0214b5c4: add r0, r4, #0x84 add r1, r4, #0x18 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x64] cmp r0, #0 mov r0, r4 @@ -21142,7 +21142,7 @@ func_ov14_0214bbdc: ; 0x0214bbdc str r3, [sp] str ip, [sp, #4] str lr, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] bl func_01ffa0f4 @@ -21283,7 +21283,7 @@ func_ov14_0214bd7c: ; 0x0214bd7c str ip, [sp] str lr, [sp, #4] str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] bl func_01ffa0f4 @@ -21344,7 +21344,7 @@ func_ov14_0214be78: ; 0x0214be78 mov r0, r4 mov r2, r4 add r1, r5, #0x18 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r4, r5, pc} arm_func_end func_ov14_0214be78 @@ -21686,7 +21686,7 @@ func_ov14_0214c274: ; 0x0214c274 add r1, sp, #4 str r3, [sp, #4] mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldrb r1, [r4, #0x14] ldr r0, _0214c2e4 ; =gMapManager ldrb ip, [r4, #0x15] @@ -21904,7 +21904,7 @@ func_ov14_0214c55c: ; 0x0214c55c add r2, sp, #0 add r1, r8, #0xc mov r5, r3 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -22185,7 +22185,7 @@ func_ov14_0214c948: ; 0x0214c948 mov r4, r0 mov r8, r1 mov r6, r3 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -23107,7 +23107,7 @@ _0214d46c: add r0, r4, #0x18 add r1, sp, #0x30 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldrh r0, [r4, #0x26] add r1, sp, #0x3c strh r0, [r4, #0x66] @@ -23116,11 +23116,11 @@ _0214d46c: streqh r0, [r4, #0x66] add r0, sp, #0x54 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x48 add r1, sp, #0x3c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r3, r0, #7 @@ -23284,7 +23284,7 @@ _0214d704: mov r0, r3 mov r2, r3 add r1, r5, #0xcc - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0214da20 ; =data_027e0e58 add r8, r5, #0xb4 ldr r6, [r0] @@ -23507,7 +23507,7 @@ _0214da68: mov r0, r3 mov r2, r3 add r1, r4, #0xcc - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0214db64 ; =data_027e0e58 add r8, r4, #0xb4 ldr r6, [r0] @@ -24211,7 +24211,7 @@ func_ov14_0214e38c: ; 0x0214e38c str r2, [sp, #0x1c] mov r0, ip mov r2, ip - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0x800 str r0, [sp, #8] str r0, [sp, #0x10] @@ -24220,7 +24220,7 @@ func_ov14_0214e38c: ; 0x0214e38c add r0, sp, #0x38 add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #7 @@ -24629,7 +24629,7 @@ func_ov14_0214e8f0: ; 0x0214e8f0 str lr, [sp, #0x14] str ip, [sp, #0x18] str r3, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub mov r2, #0x800 mov r1, #0x1000 str r1, [sp, #0xc] @@ -24638,7 +24638,7 @@ func_ov14_0214e8f0: ; 0x0214e8f0 str r2, [sp, #8] str r2, [sp, #0x10] mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x6000 orr r0, r0, #0x4000 @@ -25847,11 +25847,11 @@ func_ov14_0214f8f0: ; 0x0214f8f0 add r0, sp, #0x58 add r1, sp, #0x40 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x4c add r1, sp, #0x34 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #4 str r0, [sp] ldr r0, _0214fa40 ; =data_027e0e58 @@ -26406,7 +26406,7 @@ _02150070: str r8, [sp, #0x14] str r7, [sp, #0x18] str r3, [sp, #0x1c] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [r4, #0x60] str r0, [r4, #0x64] @@ -27527,7 +27527,7 @@ _02150c30: add r0, r4, #0x18 add r1, sp, #0x38 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x18 add r3, sp, #0x20 ldmia r0, {r0, r1, r2} @@ -27535,7 +27535,7 @@ _02150c30: mov r0, r3 mov r2, r3 add r1, sp, #0x2c - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #7 @@ -28553,7 +28553,7 @@ func_ov14_0215176c: ; 0x0215176c str ip, [sp, #0x38] str r3, [sp, #0x3c] str r3, [sp, #0x40] - bl func_01ff9bc4 + bl Vec3p_Add _021517cc: ldr r1, [r5, #0x18] add r0, sp, #0x50 @@ -28576,7 +28576,7 @@ _021517cc: str r4, [sp, #0x2c] str ip, [sp, #0x30] str r3, [sp, #0x34] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x44 mov ip, #0x1000 mov r3, #0x800 @@ -28585,7 +28585,7 @@ _021517cc: str r4, [sp, #0x20] str ip, [sp, #0x24] str r3, [sp, #0x28] - bl func_01ff9bc4 + bl Vec3p_Add mov ip, #0 bic r2, ip, #0x1f ldrh r1, [r5, #0x24] diff --git a/asm/ov15.inc b/asm/ov15.inc index 2c491ca0..6e42b4f3 100644 --- a/asm/ov15.inc +++ b/asm/ov15.inc @@ -292,13 +292,13 @@ .extern func_01ff9958 .extern func_01ff9b4c .extern func_01ff9b88 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c2c -.extern func_01ff9c68 -.extern func_01ff9cec -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Dot +.extern Vec3p_Cross +.extern Vec3p_Length +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ff9f3c .extern func_01ffa0f4 @@ -440,7 +440,7 @@ .extern func_0203eba8 .extern func_0203ebc8 .extern func_02042f68 -.extern func_02042f74 +.extern abs .extern func_02043594 .extern func_020435b4 .extern func_02043600 diff --git a/asm/ov15.s b/asm/ov15.s index 682834d5..fb28ddd9 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -134,7 +134,7 @@ _0211f790: ldr r3, [r5, #0xc] mov r2, r0 str r3, [sp, #0x20] - bl func_01ff9bc4 + bl Vec3p_Add _0211f7f8: ldr r0, _0211f860 ; =data_027e0d3c add r1, sp, #0x18 @@ -2889,7 +2889,7 @@ func_ov15_02121bec: ; 0x02121bec ldr r0, _02121d58 ; =gPlayerPos add r1, sp, #0x3c add r2, sp, #0x30 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #4 bl func_ov00_020c1500 mvn r0, #0 @@ -3529,7 +3529,7 @@ _021224dc: add r0, sp, #0x48 add r1, sp, #0x10 add r2, sp, #0x54 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0212266c ; =0x53454f43 cmp r4, r0 bne _021225f0 @@ -3654,7 +3654,7 @@ _02122794: add r0, sp, #0xb4 add r1, sp, #0xd8 add r2, sp, #0xa8 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xa8] ldr r1, [sp, #0xb0] bl func_01ffa0f4 @@ -4328,7 +4328,7 @@ _02123134: ldr r0, _021232ac ; =gPlayerPos add r2, sp, #0x18 add r1, r5, #4 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0x18 str r1, [sp, #0x1c] @@ -4352,14 +4352,14 @@ _02123134: str r3, [sp, #4] ldr r3, [r5, #0xc] str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x24 add r1, sp, #0x18 - bl func_01ff9c2c + bl Vec3p_Dot movs r4, r0 bmi _02123298 add r0, sp, #0x24 - bl func_01ff9cec + bl Vec3p_Length cmp r4, r0 bge _02123298 ldr r0, [sp, #0x18] @@ -4503,7 +4503,7 @@ func_ov15_021232b4: ; 0x021232b4 add r0, sp, #0x1c mov r1, r4 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x1c] ldr r1, [sp, #0x24] bl func_01ffa0f4 @@ -4651,11 +4651,11 @@ _02123550: add r2, r4, #0x15c str r5, [sp, #0x1c] str r7, [sp, #0x18] - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x15c add r1, r4, #0x48 add r2, sp, #0xc - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, _021236e8 ; =data_ov15_021896d0 ldrsh r1, [r0, #0x10] mov r0, r1, lsl #0x1 @@ -4691,7 +4691,7 @@ _0212364c: add r1, sp, #0xc add r0, r4, #0x48 add r2, r4, #0x15c - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 add r1, r4, #0x15c bl _ZN5Actor10GetAngleToEP5Vec3p @@ -4784,7 +4784,7 @@ func_ov15_02123770: ; 0x02123770 mov r0, r3 mov r2, r3 add r1, r4, #0x7c - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -5043,7 +5043,7 @@ func_ov15_02123a9c: ; 0x02123a9c add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add _02123b10: mov r0, r5 mov r1, #1 @@ -5715,7 +5715,7 @@ func_ov15_02124388: ; 0x02124388 str r4, [sp] str ip, [sp, #4] str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r4, r5, pc} .align 2, 0 @@ -5874,7 +5874,7 @@ _02124590: str r1, [r5, #0x6c] add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r5, #0x184 mov r1, #2 bl func_ov00_020c5d74 @@ -6206,7 +6206,7 @@ _02124ad4: add r0, r10, #0x48 add r1, r10, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldrb r2, [r10, #0x2b8] ldr r0, [r10, #0x2a8] cmp r2, #1 @@ -6322,7 +6322,7 @@ _02124bbc: str r3, [sp, #0x18] mov r8, r9, asr #0x1f mov r6, r7, asr #0x1f - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0x800 ldr r3, _02125038 ; =0xfffffb33 mvn r11, #0 @@ -6963,7 +6963,7 @@ func_ov15_02125474: ; 0x02125474 strh r6, [ip, #0x20] strh r5, [r4, #0x7a] str r3, [r4, #0x130] - bl func_01ff9bf8 + bl Vec3p_Sub mov r2, #0 ldr r0, [sp] ldr r1, [sp, #8] @@ -6978,7 +6978,7 @@ func_ov15_02125474: ; 0x02125474 add r0, r4, #0x48 add r2, r4, #0x28c str r3, [r4, #0x2a0] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r4, #0x188 mov r1, #0 bl func_ov00_020c5d74 @@ -7595,11 +7595,11 @@ func_ov15_02125e00: ; 0x02125e00 mov r0, r3 beq _02125e3c add r1, r5, #0x28c - bl func_01ff9bf8 + bl Vec3p_Sub b _02125e44 _02125e3c: add r1, r5, #0x28c - bl func_01ff9bc4 + bl Vec3p_Add _02125e44: add r0, sp, #0 bl func_ov15_0215cef8 @@ -7612,7 +7612,7 @@ _02125e44: mov r1, r4 mov r2, r0 str r3, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, [r5, #0x4c] add r1, sp, #0x18 add r0, r5, #0x48 @@ -7633,9 +7633,9 @@ _02125eb4: add r0, sp, #0x18 add r1, r5, #0x48 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r4 - bl func_01ff9cec + bl Vec3p_Length ldr r1, _02125f80 ; =0x00001333 mov r2, #0 umull r4, r3, r0, r1 @@ -7795,7 +7795,7 @@ func_ov15_021260a8: ; 0x021260a8 add r2, sp, #0 add r0, r4, #0x48 add r1, ip, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -8708,7 +8708,7 @@ _02126b5c: mov r0, r3 mov r2, r3 add r1, r4, #0x18 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02126bbc ; =data_027e0e58 add r2, sp, #0 ldr r0, [r0] @@ -9373,7 +9373,7 @@ _02127304: mov r0, r3 mov r2, r3 add r1, r4, #0x18 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02127364 ; =data_027e0e58 add r2, sp, #0 ldr r0, [r0] @@ -12591,7 +12591,7 @@ func_ov15_02129b50: ; 0x02129b50 add r0, r4, #0x1a0 add r1, sp, #0 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add bl func_ov15_0214652c mov r1, r0 mov r0, r4 @@ -13521,7 +13521,7 @@ func_ov15_0212a780: ; 0x0212a780 add r1, r10, #0x50 str r4, [sp, #0x78] str r3, [sp, #0x74] - bl func_01ff9bc4 + bl Vec3p_Add cmp r5, #0 beq _0212a7e4 ldr r0, _0212ad78 ; =data_027e0d38 @@ -14142,7 +14142,7 @@ _0212b08c: add r0, sp, #0x54 add r1, sp, #0x3c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x54 add r1, sp, #8 add r2, sp, #4 @@ -14351,12 +14351,12 @@ func_ov15_0212b3b8: ; 0x0212b3b8 add r0, sp, #0 add r1, r4, #0x50 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add _0212b408: add r0, sp, #0xc add r1, sp, #0 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr lr, [sp, #0xc] ldr ip, [sp, #0x14] mov r0, lr, asr #0xc @@ -15198,7 +15198,7 @@ func_ov15_0212bea4: ; 0x0212bea4 add r1, r6, #0x10 mov r2, r0 str r3, [r6, #0x2c] - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #4 add r2, sp, #0 add r0, r6, #4 @@ -15723,7 +15723,7 @@ _0212c574: str r3, [sp] str r6, [sp, #4] str r9, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r10, #4] mov r1, r5 bl func_ov15_0212adb8 @@ -16905,14 +16905,14 @@ func_ov15_0212d580: ; 0x0212d580 mov r0, r5 add r1, r4, #0x1c8 str r3, [sp, #0x10] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 add r1, r4, #0x100 strh r0, [r1, #0xd4] add r0, sp, #0 - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0xa4 bge _0212d5fc ldr r0, [sp] @@ -16957,11 +16957,11 @@ _0212d67c: add r0, r4, #0x1c8 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r2, sp, #0x18 add r0, r4, #0x1c8 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r2, #0 ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] @@ -16980,7 +16980,7 @@ _0212d6c8: bl func_ov15_0214eb18 _0212d6d8: add r0, sp, #0x18 - bl func_01ff9cec + bl Vec3p_Length mov r1, r0, asr #0x4 add r0, r0, r1, lsr #27 movs r3, r0, asr #0x5 @@ -17019,7 +17019,7 @@ _0212d704: mov ip, ip, lsr #0xc orr ip, ip, r3, lsl #20 str ip, [sp, #0x20] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4, #0x240] mvn r0, #0x80000000 cmp r1, r0 @@ -17372,7 +17372,7 @@ _0212dbf4: add r1, sp, #0x10 mov r2, r0 str r3, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 bl func_ov15_0212e2c0 mov r0, r4 @@ -17537,7 +17537,7 @@ _0212de68: str r5, [sp, #0x44] str r3, [sp, #0x48] mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x24c] cmp r0, #0 bne _0212e03c @@ -17848,11 +17848,11 @@ func_ov15_0212e2c0: ; 0x0212e2c0 mov r0, r6 mov r1, r3 mov r2, r3 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0x70 str r1, [sp, #0x74] - bl func_01ff9cec + bl Vec3p_Length ldr r1, _0212e774 ; =0x00007b30 mov r2, #0 umull r3, r5, r0, r1 @@ -17878,12 +17878,12 @@ func_ov15_0212e2c0: ; 0x0212e2c0 mov r1, r3 mov r0, r5 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy add r2, sp, #0x70 rsb r0, r5, #0 add r1, r4, #0x60 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, #0 str r0, [sp, #0x74] ldr r0, [sp, #0x70] @@ -17891,7 +17891,7 @@ func_ov15_0212e2c0: ; 0x0212e2c0 bl func_01ffa0f4 mov r5, r0, lsl #0x10 add r0, sp, #0x70 - bl func_01ff9cec + bl Vec3p_Length ldr r2, _0212e778 ; =data_027e0764 mov r1, #0 ldr ip, [r2] @@ -18058,7 +18058,7 @@ _0212e4e0: mov r0, r10 add r1, sp, #0x4c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x20 bl func_ov00_020c1500 mvn r0, #0 @@ -18102,7 +18102,7 @@ _0212e4e0: str r0, [r4, #0x254] add r0, sp, #0x4c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldrb r0, [r4, #0x272] cmp r0, #0 beq _0212e730 @@ -18491,7 +18491,7 @@ func_ov15_0212ebf0: ; 0x0212ebf0 add r0, sp, #4 mov r1, r6 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0212ed68 ; =data_027e0e58 add r2, sp, #4 ldr r0, [r0] @@ -18512,7 +18512,7 @@ func_ov15_0212ebf0: ; 0x0212ebf0 add r0, sp, #4 mov r1, r6 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0212ed68 ; =data_027e0e58 add r2, sp, #4 ldr r0, [r0] @@ -18680,7 +18680,7 @@ _0212ee94: str r5, [sp] str r4, [sp, #4] str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc} .align 2, 0 @@ -20081,7 +20081,7 @@ _02130220: add r0, sp, #0x24 add r1, r5, #0x48 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02130540 ; =gMapManager add r1, sp, #0x24 ldr r0, [r0] @@ -20097,7 +20097,7 @@ _02130220: ldr r3, [sp, #0x2c] mov r2, r0 str r3, [r5, #0x49c] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x24] ldr r1, [sp, #0x2c] bl func_01ffa0f4 @@ -20121,7 +20121,7 @@ _02130220: add r0, sp, #0x18 add r1, r5, #0x48 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02130540 ; =gMapManager add r1, sp, #0x18 ldr r0, [r0] @@ -20588,7 +20588,7 @@ func_ov15_0213091c: ; 0x0213091c add r2, sp, #4 mov r1, ip add r0, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub sub r0, r5, #0x8000 mov r1, r0, lsl #0x10 add ip, r4, #0x48 @@ -20678,7 +20678,7 @@ _02130aa8: add r2, sp, #0x28 mov r0, r3 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x28] ldr r1, [sp, #0x30] bl func_01ffa0f4 @@ -20787,7 +20787,7 @@ _02130c68: _02130c74: mov r4, r0 add r0, sp, #0 - bl func_01ff9cec + bl Vec3p_Length mov r1, r0, asr #0x4 add r0, r0, r1, lsr #27 movs r0, r0, asr #0x5 @@ -20825,7 +20825,7 @@ _02130ca4: str r7, [sp] str r3, [sp, #4] str ip, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, pc} @@ -21829,7 +21829,7 @@ _02131b10: add r1, r4, #0x60 mov r2, r0 str r3, [r4, #0x68] - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0x188 ldmia sp!, {r4, pc} _02131b98: @@ -22048,7 +22048,7 @@ _02131e50: add r1, r4, #0x60 mov r2, r0 str r3, [r4, #0x68] - bl func_01ff9bc4 + bl Vec3p_Add _02131ed0: add sp, sp, #0x188 ldmia sp!, {r4, pc} @@ -22284,11 +22284,11 @@ func_ov15_021321c4: ; 0x021321c4 add r0, sp, #0xc add r1, sp, #0x18 add r2, sp, #0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0 ldr r1, _02132264 ; =gPlayerPos mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0 ldmia r0, {r0, r1, r2} stmia r4, {r0, r1, r2} @@ -23585,11 +23585,11 @@ _021333cc: add r2, sp, #0x94 mov r0, r3 add r1, r7, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0x94 str r1, [sp, #0x98] - bl func_01ff9cec + bl Vec3p_Length ldr r1, _02133cb0 ; =data_027e0fac mov r4, r0 ldrsh r5, [r1] @@ -23695,7 +23695,7 @@ _02133594: add r0, sp, #0xa0 add r1, sp, #0x88 add r2, sp, #0x68 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r6, lsl #0x10 mov r0, r0, lsr #0x10 mov r0, r0, asr #0x4 @@ -23777,11 +23777,11 @@ _021336cc: add r2, sp, #0x5c add r0, r7, #0x338 add r1, r7, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0x5c str r1, [sp, #0x60] - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x7b bge _02133720 mov r0, r7 @@ -24213,7 +24213,7 @@ func_ov15_02133cec: ; 0x02133cec add r0, r4, #0x32c add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x2fc add r1, r4, #0x32c bl func_ov00_020c6f08 @@ -25298,13 +25298,13 @@ func_ov15_02134ae4: ; 0x02134ae4 add r0, sp, #8 add r2, sp, #0x24 add r1, r6, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 ldr r4, [sp, #0x28] add r0, sp, #0x18 str r1, [sp, #0x28] str r1, [sp, #0x1c] - bl func_01ff9cec + bl Vec3p_Length mov r5, r0 ldr r0, [sp, #0x24] ldr r1, [sp, #0x2c] @@ -25354,7 +25354,7 @@ _02134c18: cmp r5, #0 ble _02134c70 add r0, sp, #0x24 - bl func_01ff9cec + bl Vec3p_Length mov r1, r5 bl func_02002c14 mov r5, r0 @@ -25377,7 +25377,7 @@ _02134c70: add r0, r6, #0x48 add r1, r6, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldrb r0, [r6, #0x21b] cmp r0, #0 bne _02134cdc @@ -25422,7 +25422,7 @@ func_ov15_02134cfc: ; 0x02134cfc add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 mov r1, #1 bl _ZN5Actor18CollidesWithPlayerEj @@ -26124,7 +26124,7 @@ func_ov15_02135648: ; 0x02135648 adc r1, r3, #0 mov r0, r2, lsr #0xc orr r0, r0, r1, lsl #20 - bl func_02042f74 + bl abs mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 cmp r1, #0x100 @@ -26362,7 +26362,7 @@ _02135988: ldr r1, _02135af0 ; =gPlayerPos add r0, sp, #0xc add r2, sp, #0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -26793,12 +26793,12 @@ func_ov15_02135e2c: ; 0x02135e2c stmia r3, {r0, r1, r2} mov r0, r3 mov r1, r3 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r1, _021360cc ; =0x00000333 add r0, sp, #0xa0 str r1, [sp, #0xa4] mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r3, [sp, #0xa8] ldr r2, [sp, #0xa4] ldr r1, [sp, #0xa0] @@ -26935,7 +26935,7 @@ _0213618c: ldr r1, _021363e4 ; =gPlayerPos add r0, sp, #0xb4 mov r2, r7 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [r8, #0x20] add r0, sp, #0x80 ldrsh r5, [r1, #0x94] @@ -27035,12 +27035,12 @@ _021362fc: add r1, sp, #0x74 mov r2, r7 strh r5, [r3, #0x94] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r4, [r7, #4] mov r1, #0 mov r0, r7 str r1, [r7, #4] - bl func_01ff9cec + bl Vec3p_Length mov r1, r0, asr #0x9 add r0, r0, r1, lsr #22 mov r5, r0, asr #0xa @@ -27195,7 +27195,7 @@ func_ov15_021364b0: ; 0x021364b0 add r0, sp, #0x14 ldr r1, _02136614 ; =data_027e0fa0 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #0x14 mov r0, r4 bl func_ov15_02135e2c @@ -27211,7 +27211,7 @@ _02136590: ldr r1, _02136618 ; =gPlayerPos add r0, sp, #0x14 add r2, sp, #8 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0213661c ; =data_027e0ffc ldr r1, _02136620 ; =0x0000020d add r2, sp, #8 @@ -27403,7 +27403,7 @@ func_ov15_0213677c: ; 0x0213677c str r3, [sp, #4] ldr r3, [r4, #0x1c] str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub mov r3, #0 ldr r0, _02136884 ; =data_027e0fac mov r2, #0x1000 @@ -27416,7 +27416,7 @@ func_ov15_0213677c: ; 0x0213677c bl func_ov00_020a61ac add r0, sp, #0x18 add r1, sp, #0xc - bl func_01ff9c2c + bl Vec3p_Dot mov r2, r0, lsl #0xf mov r0, r2, asr #0xb add r0, r2, r0, lsr #20 @@ -27832,7 +27832,7 @@ func_ov15_02136d04: ; 0x02136d04 ldr r1, _0213711c ; =gPlayerPos add r2, sp, #0xc add r0, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] bl func_01ffa0f4 @@ -27841,7 +27841,7 @@ func_ov15_02136d04: ; 0x02136d04 bl func_ov15_021368c8 str r0, [r4, #0x88] add r0, sp, #0xc - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x1000 movlt r0, #0 strltb r0, [r4, #0x25f] @@ -27929,11 +27929,11 @@ _02136d5c: add r1, sp, #0 ldr r0, _0213711c ; =gPlayerPos mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #0 add r0, r4, #0xa4 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x264] subs r0, r0, #1 str r0, [r4, #0x264] @@ -28239,12 +28239,12 @@ _021372e0: addeq sp, sp, #0x10 ldmeqia sp!, {r3, r4, r5, pc} ldr r0, _021374cc ; =data_027e0fa0 - bl func_01ff9cec + bl Vec3p_Length movs r4, r0 beq _021373f0 ldr r0, _021374cc ; =data_027e0fa0 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize mov r0, r5 bl func_ov15_021366d8 cmp r4, r0 @@ -28346,7 +28346,7 @@ _02137408: bl func_ov00_020a61ac add r0, sp, #4 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r1, sp, #4 add r0, r5, #0x180 bl func_ov00_020b7ea4 @@ -28459,7 +28459,7 @@ func_ov15_02137574: ; 0x02137574 str lr, [sp, #4] str ip, [sp, #8] str r5, [sp, #0xc] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r6, #0x4d8] cmp r0, #0 beq _021376b4 @@ -28549,7 +28549,7 @@ _0213773c: mov r1, #0 add r0, sp, #0x1c str r1, [sp, #0x20] - bl func_01ff9cec + bl Vec3p_Length mov r1, r0 mov r0, r6 bl func_01ffa0f4 @@ -28611,7 +28611,7 @@ func_ov15_021377d4: ; 0x021377d4 add r1, sp, #0x18 ldr r0, _02137914 ; =gPlayerPos mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0x5c str r1, [sp] add r0, sp, #0x18 @@ -28646,7 +28646,7 @@ func_ov15_021377d4: ; 0x021377d4 bl func_ov00_020a61ac add r0, sp, #0xc mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, r4, #0x178 add r1, sp, #0xc bl func_ov00_020b7ea4 @@ -28662,7 +28662,7 @@ func_ov15_021377d4: ; 0x021377d4 bl func_ov00_020a61ac add r0, sp, #0xc mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, r4, #0x17c add r1, sp, #0xc bl func_ov00_020b7ea4 @@ -28818,7 +28818,7 @@ _02137b00: add r1, sp, #0xc ldr r0, _02137ca8 ; =gPlayerPos mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add add r2, r4, #0x16c add r1, r4, #0x178 cmp r2, r1 @@ -28893,7 +28893,7 @@ _02137c18: bl func_ov00_020a61ac add r0, sp, #0 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r1, sp, #0 add r0, r4, #0x178 bl func_ov00_020b7ea4 @@ -28909,7 +28909,7 @@ _02137c18: bl func_ov00_020a61ac add r0, sp, #0 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r1, sp, #0 add r0, r4, #0x17c bl func_ov00_020b7ea4 @@ -29072,7 +29072,7 @@ _02137e74: add r1, sp, #0x58 ldr r0, _021382e8 ; =gPlayerPos mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0x52 str r0, [sp] mov r0, #0x53 @@ -29114,7 +29114,7 @@ _02137f18: add r1, sp, #0x4c ldr r0, _021382e8 ; =gPlayerPos mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0x53 str r1, [sp] add r0, sp, #0x4c @@ -29144,7 +29144,7 @@ _02137f8c: add r1, sp, #0x40 ldr r0, _021382e8 ; =gPlayerPos mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0x53 str r1, [sp] add r0, sp, #0x40 @@ -29174,7 +29174,7 @@ _02138000: add r1, sp, #0x34 ldr r0, _021382e8 ; =gPlayerPos mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0x4d str r0, [sp] mov r0, #0x4e @@ -29537,7 +29537,7 @@ func_ov15_02138478: ; 0x02138478 str r0, [sp, #0x44] mov r3, r2 mov r0, #0x800 - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, r9 add r1, sp, #0x3c bl func_ov15_02138408 @@ -29554,7 +29554,7 @@ func_ov15_02138478: ; 0x02138478 rsb r0, r0, #0 add r1, sp, #0x54 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, r9 add r1, sp, #0x30 bl func_ov15_02138408 @@ -29570,7 +29570,7 @@ func_ov15_02138478: ; 0x02138478 mov r3, r2 mov r0, #0x400 str r5, [sp, #0x2c] - bl func_01ff9e64 + bl Vec3p_Axpy add r1, sp, #0x24 mov r0, r9 bl func_ov15_02138408 @@ -29587,7 +29587,7 @@ func_ov15_02138478: ; 0x02138478 str r1, [sp, #0x20] add r1, sp, #0x48 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, r9 add r1, sp, #0x18 bl func_ov15_02138408 @@ -29695,7 +29695,7 @@ _0213879c: add r1, sp, #0x6c mov r3, r2 rsb r0, ip, #0 - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, r10, asr #0x1f mov r1, r0, lsl #0x4 mov r0, #0x800 @@ -29708,7 +29708,7 @@ _0213879c: rsb r0, r1, #0 add r1, sp, #0x60 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy ldr ip, _02138ba4 ; =data_027e0fa0 ldr r0, [sp, #0x10] ldr r1, [ip, #4] @@ -29988,7 +29988,7 @@ _02138c18: ldr r0, _02138f9c ; =gPlayerPos ldr r1, _02138fa0 ; =data_027e0fa0 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xe8 ldmia sp!, {r3, r4, r5, r6, r7, pc} _02138c30: @@ -30004,7 +30004,7 @@ _02138c30: ldr r0, _02138fa0 ; =data_027e0fa0 add r1, sp, #0x6c add r2, sp, #0x60 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02138fa4 ; =data_027e0ff8 mvn r1, #0 str r1, [sp, #0x24] @@ -30017,7 +30017,7 @@ _02138c30: add r0, sp, #0x60 add r1, sp, #0x54 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 ldr r1, _02138fa8 ; =0x0000ffff strh r0, [sp, #0xb4] @@ -30067,7 +30067,7 @@ _02138c30: beq _02138eb8 add r0, sp, #0x94 add r1, sp, #0x48 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r0, [sp, #0x48] ldr r1, [sp, #0x50] bl func_01ffa0f4 @@ -30122,7 +30122,7 @@ _02138c30: subgt r0, r0, r2 strgt r0, [r4, #0x80] add r0, sp, #0x48 - bl func_01ff9c2c + bl Vec3p_Dot mvn r1, #0xcc cmp r0, r1 bge _02138eb8 @@ -30465,7 +30465,7 @@ _021392cc: add r1, sp, #0x3c ldr r0, _021394fc ; =gPlayerPos mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0x5c str r1, [sp] add r0, sp, #0x3c @@ -30500,7 +30500,7 @@ _021392cc: bl func_ov00_020a61ac add r0, sp, #0x30 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, r7, #0x178 add r1, sp, #0x30 bl func_ov00_020b7ea4 @@ -30516,7 +30516,7 @@ _021392cc: bl func_ov00_020a61ac add r0, sp, #0x30 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, r7, #0x17c add r1, sp, #0x30 bl func_ov00_020b7ea4 @@ -30551,7 +30551,7 @@ _021393f4: add r0, sp, #0x24 add r1, r7, #0x64 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, _021394fc ; =gPlayerPos add r0, sp, #0x24 ldr r2, [r1, #4] @@ -30562,7 +30562,7 @@ _021393f4: add r1, sp, #0x18 mov r2, r0 str r3, [sp, #0x20] - bl func_01ff9bc4 + bl Vec3p_Add ldrsh r0, [r7, #0xa] add r2, sp, #0x24 mov r3, #0 @@ -31282,7 +31282,7 @@ func_ov15_02139ef4: ; 0x02139ef4 ldr r0, _02139f4c ; =gPlayerPos mov r2, r4 add r1, r5, #0x64 - bl func_01ff9bc4 + bl Vec3p_Add ldrsh r0, [r5, #0xa] cmp r0, #0 ble _02139f34 @@ -31313,7 +31313,7 @@ func_ov15_02139f50: ; 0x02139f50 ldr r0, _02139f78 ; =gPlayerPos mov r2, r4 add r1, r5, #0x64 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r5, #0x70] str r0, [r4, #0xc] ldmia sp!, {r3, r4, r5, pc} @@ -32505,7 +32505,7 @@ _0213ae88: add r0, sp, #0xd8 add r1, sp, #0xc0 add r2, sp, #0xcc - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #0xcc mov r0, r5 ldmia r1, {r1, r2, r3} @@ -32518,7 +32518,7 @@ _0213ae88: add r0, sp, #0xd8 add r1, sp, #0xb4 add r2, sp, #0xcc - bl func_01ff9bc4 + bl Vec3p_Add add r0, r5, #0x78 str r0, [sp] ldr r1, _0213b140 ; =func_ov15_0213a664 @@ -33156,13 +33156,13 @@ func_ov15_0213b6f4: ; 0x0213b6f4 add r1, r4, #0x60 mov r2, r0 str r3, [r4, #0x64] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, _0213b81c ; =gPlayerPos add r2, sp, #0 add r0, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 - bl func_01ff9cec + bl Vec3p_Length mov r5, r0 cmp r5, #0x800 addge sp, sp, #0xc @@ -33184,7 +33184,7 @@ func_ov15_0213b6f4: ; 0x0213b6f4 add r0, r4, #0x48 add r1, sp, #0 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r4, r5, pc} .align 2, 0 @@ -33234,7 +33234,7 @@ func_ov15_0213b820: ; 0x0213b820 orr r4, r4, r3, lsl #20 str r4, [r2, #0x68] add r2, r2, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0213b8c0: .word 0x00000d9a @@ -33342,7 +33342,7 @@ _0213ba10: ldr r0, _0213bbd4 ; =gPlayerPos add r2, sp, #4 add r1, r8, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #4] ldr r1, [sp, #0xc] bl func_01ffa0f4 @@ -33534,7 +33534,7 @@ func_ov15_0213bcc8: ; 0x0213bcc8 ldr r0, _0213bee8 ; =gPlayerPos add r2, sp, #0x10 add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, _0213beec ; =data_ov15_02185f9c add r3, sp, #4 ldmia r0, {r0, r1, r2} @@ -33546,19 +33546,19 @@ func_ov15_0213bcc8: ; 0x0213bcc8 add r0, sp, #0x10 add r1, sp, #4 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r5, #0x288] sub r0, r0, #1 str r0, [r5, #0x288] cmp r0, #0 ble _0213bd38 add r0, sp, #0x10 - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x2000 bge _0213bd64 _0213bd38: ldr r0, _0213bef4 ; =data_027e0fa0 - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x52 mov r0, r5 ble _0213bd58 @@ -33751,7 +33751,7 @@ func_ov15_0213bfe8: ; 0x0213bfe8 ldr r0, _0213c258 ; =gPlayerPos add r2, sp, #0x10 add r1, r6, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, _0213c25c ; =data_ov15_02185fa8 add r3, sp, #4 ldmia r0, {r0, r1, r2} @@ -33763,7 +33763,7 @@ func_ov15_0213bfe8: ; 0x0213bfe8 add r0, sp, #0x10 add r1, sp, #4 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r6, #0x288] cmp r0, #0 bgt _0213c0a4 @@ -33854,7 +33854,7 @@ _0213c0ec: smulbb r1, r2, r1 add r1, r1, #0x800 mov r4, r1, asr #0xc - bl func_01ff9cec + bl Vec3p_Length smull r2, r1, r0, r4 adds r2, r2, #0x800 adc r0, r1, #0 @@ -33992,7 +33992,7 @@ func_ov15_0213c364: ; 0x0213c364 ldr r0, _0213c4e0 ; =gPlayerPos add r2, sp, #4 add r1, r7, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #4] ldr r1, [sp, #0xc] bl func_01ffa0f4 @@ -34283,7 +34283,7 @@ func_ov15_0213c788: ; 0x0213c788 mov r4, r0 bl _ZN5Actor16XzDistanceToLinkEv ldr r0, _0213cb00 ; =data_027e0fa0 - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x52 ble _0213c7b4 mov r0, r4 @@ -34414,11 +34414,11 @@ _0213c990: ldr r0, _0213cb0c ; =gPlayerPos add r2, sp, #4 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #4 add r1, r4, #0x268 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #4] ldr r1, [sp, #0xc] bl func_01ffa0f4 @@ -34970,13 +34970,13 @@ _0213d09c: ldr r3, [r3, #8] mov r2, r0 str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub b _0213d118 _0213d108: add r0, sp, #0xc add r1, sp, #0x18 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub _0213d118: ldr r1, [r9, #4] add r0, sp, #0xc @@ -36007,7 +36007,7 @@ func_ov15_0213ddb8: ; 0x0213ddb8 add r2, sp, #0 add r1, r7, #0x48 mov r4, r3 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [sp, #4] cmp r4, #0 @@ -36028,7 +36028,7 @@ _0213de04: bl func_0202b154 _0213de24: add r0, sp, #0 - bl func_01ff9cec + bl Vec3p_Length cmp r5, #0 strne r0, [r5] cmp r0, r6 @@ -36197,11 +36197,11 @@ _0213e048: str r7, [sp, #0x18] str r6, [sp, #0x1c] str r3, [sp, #0x20] - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x3c add r1, sp, #0x74 add r2, sp, #0x24 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r8, [sp, #0x28] mov r2, r6 ldr r0, [sp, #0x24] @@ -36232,7 +36232,7 @@ _0213e048: mov r7, r0, asr #0x10 _0213e130: add r0, sp, #0x24 - bl func_01ff9cec + bl Vec3p_Length ldr r1, [r5, #0x190] cmp r0, r1 bge _0213e1ac @@ -38375,7 +38375,7 @@ _0213ffec: ldr r0, _02140248 ; =gPlayerPos add r2, sp, #0x8c add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x8c] ldr r1, [sp, #0x94] bl func_01ffa0f4 @@ -38383,7 +38383,7 @@ _0213ffec: mov r1, #0 add r0, sp, #0x8c str r1, [sp, #0x90] - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x19000 bge _02140084 cmp r0, #0x2800 @@ -38432,11 +38432,11 @@ _02140098: mov r0, r3 mov r2, r3 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0x80 str r1, [sp, #0x84] - bl func_01ff9cec + bl Vec3p_Length rsb r0, r0, #0xa000 str r0, [r4, #0x18c] add r0, sp, #0x24 @@ -38478,7 +38478,7 @@ _0214013c: add r0, sp, #0x74 add r1, sp, #0x68 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x78 str r0, [sp] ldr r1, _02140258 ; =func_ov15_0213e434 @@ -39006,7 +39006,7 @@ func_ov15_02140854: ; 0x02140854 add r0, sp, #0xc add r1, sp, #0 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0xc ldmia r0, {r0, r1, r2} stmia r4, {r0, r1, r2} @@ -40094,7 +40094,7 @@ func_ov15_02141638: ; 0x02141638 add r0, sp, #0xc add r1, sp, #0 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [r4, #0x14] add r0, sp, #0xc ldrsh r1, [r1, #0x24] @@ -41843,7 +41843,7 @@ func_ov15_02142c78: ; 0x02142c78 ldr r3, [r3, #8] mov r2, ip str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, _02142d5c ; =data_027e0fac mov r1, #0x4000 ldrsh r2, [r0] @@ -42179,11 +42179,11 @@ _021430f8: ldr r3, [sp, #8] mov r2, r0 str r3, [r4, #0x2d8] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r4, #0x294 add r1, sp, #0 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x200 ldrsh r1, [r0, #0xfa] ldr r0, [r4, #0x20] @@ -42293,7 +42293,7 @@ func_ov15_0214325c: ; 0x0214325c add r0, sp, #4 add r1, r4, #0x2ac mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #4] str r0, [r4, #0x2c4] ldr r0, [sp, #8] @@ -42390,14 +42390,14 @@ func_ov15_02143408: ; 0x02143408 mov r0, r3 mov r2, r3 add r1, r5, #0x2ac - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _021436bc ; =0x00001ccc add r0, sp, #0xc bl func_01fffbec add r0, sp, #0xc add r1, r5, #0x2ac mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r5, #0x344] cmp r0, #0 bne _0214359c @@ -42614,7 +42614,7 @@ _02143744: ldr r3, [r4, #0x50] mov r2, r5 str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r7, #0x294 add r1, r4, #0x48 mov r2, #0x29 @@ -43039,7 +43039,7 @@ func_ov15_02143d40: ; 0x02143d40 ldr r3, [r5, #0x50] mov r2, r0 str r3, [r4, #0x308] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r5, #0x88] add sp, sp, #0xc str r0, [r4, #0x30c] @@ -43877,7 +43877,7 @@ _02144928: add r0, r1, #0x400 add r2, sp, #0xc add r1, r3, #0x400 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] bl func_01ffa0f4 @@ -43891,7 +43891,7 @@ _02144928: mov r0, #0 str r0, [sp, #4] mov r0, r3 - bl func_01ff9cec + bl Vec3p_Length mov r1, r0 ldr r0, [sp, #0x10] bl func_01ffa0f4 @@ -44074,7 +44074,7 @@ _02144a40: ldr r1, _021457d4 ; =gPlayerPos add r0, sp, #0xe4 add r2, r9, #0x358 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _021457d8 ; =data_027e0fac add r1, r9, #0x300 ldrsh r0, [r0] @@ -44101,7 +44101,7 @@ _02144a40: add r0, r1, #0x400 ldr r1, _021457d4 ; =gPlayerPos mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r9, #0x294] ldr r0, _021457e0 ; =gMapManager str r1, [r9, #0x4b8] @@ -44335,7 +44335,7 @@ _02144fdc: ldr r1, _021457d4 ; =gPlayerPos add r0, sp, #0xa8 add r2, r9, #0x358 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, _021457d8 ; =data_027e0fac add r0, r9, #0x300 ldrsh r3, [r1] @@ -44353,7 +44353,7 @@ _02144fdc: add r0, sp, #0xa8 ldr r1, _021457d4 ; =gPlayerPos mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r3, [sp, #0xac] ldr r2, [sp, #0xb0] ldr r0, [sp, #0xa8] @@ -44632,7 +44632,7 @@ _02145420: add r2, sp, #0x6c add r0, r9, #0x364 add r1, r9, #0x358 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x6c] ldr r1, [sp, #0x74] bl func_01ffa0f4 @@ -44645,7 +44645,7 @@ _02145420: add r0, sp, #0x6c str r2, [sp, #0x70] mov r4, r1, asr #0x10 - bl func_01ff9cec + bl Vec3p_Length mov r1, r0 mov r0, r5 bl func_01ffa0f4 @@ -44692,11 +44692,11 @@ _02145524: add r0, sp, #0x3c ldr r1, _021457d4 ; =gPlayerPos mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r9, #0x45c] ldr r0, _02145834 ; =0x00000e39 sub r0, r0, r1 - bl func_02042f74 + bl abs ldr r1, [r9, #0x37c] bl func_02002c14 mov r0, r0, lsl #0x10 @@ -44708,7 +44708,7 @@ _02145524: ldr r1, [r9, #0x460] ldr r0, _02145838 ; =0x000023b0 sub r0, r0, r1 - bl func_02042f74 + bl abs ldr r1, [r9, #0x37c] bl func_02002c14 mov r0, r0, lsl #0x10 @@ -44722,7 +44722,7 @@ _02145524: ldr r0, _0214583c ; =0xffff86dc sub r1, r1, r4 sub r0, r0, r1 - bl func_02042f74 + bl abs ldr r1, [r9, #0x37c] bl func_02002c14 ldr r1, _0214583c ; =0xffff86dc @@ -44737,7 +44737,7 @@ _02145524: ldr r1, [r9, #0x468] ldr r0, _021457f0 ; =0x0000028f sub r0, r0, r1 - bl func_02042f74 + bl abs ldr r1, [r9, #0x37c] bl func_02002c14 mov r2, r0 @@ -44753,7 +44753,7 @@ _02145524: mov r2, r2, asr #0x4 mov r4, r2, lsl #0x1 sub r0, r1, r0 - bl func_02042f74 + bl abs add r1, r4, #1 ldr r2, _02145840 ; =data_02050f54 mov r3, r4, lsl #0x1 @@ -44792,7 +44792,7 @@ _02145524: ldr r0, [r9, #0x4bc] add r8, r1, #0xe9 sub r0, r8, r0 - bl func_02042f74 + bl abs ldr r1, [r9, #0x37c] bl func_02002c14 mov r1, r8 @@ -44804,7 +44804,7 @@ _02145524: ldr r0, [r9, #0x4c0] sub r1, r8, #0x6a sub r0, r1, r0 - bl func_02042f74 + bl abs ldr r1, [r9, #0x37c] bl func_02002c14 mov r2, r0 @@ -46456,7 +46456,7 @@ _02146b5c: str r3, [sp, #0x10] ldr r3, [r6, #0x50] str r3, [sp, #0x14] - bl func_01ff9bc4 + bl Vec3p_Add b _02146c40 _02146bf0: ldr r1, _02146c6c ; =data_ov15_0218b3e0 @@ -46478,7 +46478,7 @@ _02146bf0: ldr r3, [r6, #0x50] mov r2, r0 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add _02146c40: add r0, r6, #0x158 ldr r4, [r0] @@ -47294,7 +47294,7 @@ _02147670: ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0xc] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x10] ldr r1, [sp, #0x18] bl func_01ffa0f4 @@ -47484,7 +47484,7 @@ _0214792c: ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc} add r0, sp, #0x10 ldr r6, [r4, #0x420] - bl func_01ff9cec + bl Vec3p_Length mov r1, #6 mul r1, r6, r1 add r1, r1, #0x33 @@ -47854,7 +47854,7 @@ _02147e9c: ldr r3, [r6, #0x50] mov r2, r0 str r3, [sp, #0xc] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x10 bl func_01fffb4c cmp r0, #0 @@ -48204,7 +48204,7 @@ func_ov15_021483b0: ; 0x021483b0 add r0, sp, #0x28 add r1, sp, #0x1c mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub ldrb r0, [r4, #0x439] cmp r0, #0 beq _02148418 @@ -48232,7 +48232,7 @@ _02148418: add r0, sp, #0x28 add r1, sp, #4 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x28] ldr r1, [sp, #0x30] bl func_01ffa0f4 @@ -48512,7 +48512,7 @@ _0214878c: mov r4, r4, lsr #0xc orr r4, r4, r3, lsl #20 str r4, [r5, #0x68] - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, [r5, #0x41c] ldr r0, _02148acc ; =data_ov15_0218b59c mov r1, #0x800 @@ -48597,17 +48597,17 @@ _021488b4: add r1, sp, #0x28 mov r2, r0 str r3, [sp, #0x24] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x1c mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, sp, #0x1c mov r1, r4 bl func_01fffbec add r0, sp, #0x1c add r1, sp, #0x28 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0x1c] str r0, [r5, #0x48] ldr r0, [sp, #0x24] @@ -50356,7 +50356,7 @@ _0214a078: add r1, sp, #0x24 ldr r0, [sp, #0x70] mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r8, #0x1c] add r3, sp, #0 add r0, r0, #0x8c @@ -50422,7 +50422,7 @@ _0214a108: mov r2, r6 add r0, sp, #0x24 add r1, sp, #0xc - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x28 mov r1, r7 mov r2, r7 @@ -50591,7 +50591,7 @@ func_ov15_0214a3b0: ; 0x0214a3b0 str r3, [sp, #0x48] ldr r3, [r6, #0x100] str r3, [sp, #0x4c] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x74 bl func_01fffb4c cmp r0, #0 @@ -50787,7 +50787,7 @@ _0214a6bc: add r1, sp, #0x74 mov r2, r0 str r9, [sp, #0x74] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r6, #0xfc] ldr r0, [sp, #0x54] mov r2, #1 @@ -50930,7 +50930,7 @@ _0214a8e8: str r3, [sp, #0x70] ldr r3, [r10, #0x100] str r3, [sp, #0x74] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp, #0xac] ldr r0, [sp, #0xa8] mov r2, r1, asr #0x2 @@ -51042,10 +51042,10 @@ _0214aab8: ldr r3, [r10, #0x100] mov r2, r0 str r3, [sp, #0x5c] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x90 mov r5, #0 - bl func_01ff9cec + bl Vec3p_Length cmp r0, r4 blt _0214ab04 _0214aaf4: @@ -51177,7 +51177,7 @@ _0214abd0: add r1, sp, #0xa8 mov r2, r0 mov r6, #0x80000 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, r7 add r0, sp, #0x78 bl func_01fffbec @@ -51252,7 +51252,7 @@ _0214adf4: movne r6, #0x80000 add r1, sp, #0xa8 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r6, lsl #0x8 mov r0, r0, asr #0x10 mov r0, r0, lsl #0x10 @@ -51700,10 +51700,10 @@ func_ov15_0214b408: ; 0x0214b408 str r3, [sp, #0x58] ldr r3, [r9, #0x118] str r3, [sp, #0x5c] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x54 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r1, [r9, #0x190] add r0, sp, #0x54 bl func_01fffbec @@ -51741,7 +51741,7 @@ _0214b4e0: mov r0, r6 mov r1, r5 mov r2, r6 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0x3c] ldr r1, [sp, #0x40] bl func_01ffa0f4 @@ -51835,9 +51835,9 @@ func_ov15_0214b61c: ; 0x0214b61c ldr r3, [r4, #0x118] mov r2, r0 str r3, [sp, #0x38] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x30 - bl func_01ff9cec + bl Vec3p_Length movs r4, r0 addeq sp, sp, #0x48 ldmeqia sp!, {r4, pc} @@ -52177,7 +52177,7 @@ _0214bab8: add r1, sp, #0xc mov r0, r4 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r6, #0xc] add r1, sp, #0 str r0, [sp] @@ -52263,7 +52263,7 @@ func_ov15_0214bb9c: ; 0x0214bb9c add r1, sp, #0x60 mov r0, r4 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r6, #0xc0] add r1, sp, #0x90 add r2, sp, #0x60 @@ -54148,7 +54148,7 @@ func_ov15_0214d314: ; 0x0214d314 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4, #0x4c] ldr r0, [r4, #0x18] cmp r1, r0 @@ -54382,7 +54382,7 @@ func_ov15_0214d5c0: ; 0x0214d5c0 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4, #0x4c] ldr r0, [r4, #0x18] cmp r1, r0 @@ -55330,22 +55330,22 @@ _0214e16c: ldr r11, [r10, #0x19c] ldr r4, [r10, #0x198] mov r0, r11 - bl func_01ff9e64 + bl Vec3p_Axpy add r2, sp, #0x74 rsb r0, r11, #0 add r1, sp, #0x98 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy add r2, sp, #0x68 add r1, sp, #0x8c mov r0, r4 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy add r2, sp, #0x5c add r1, sp, #0x8c mov r3, r2 rsb r0, r4, #0 - bl func_01ff9e64 + bl Vec3p_Axpy add r1, sp, #0x80 mov r0, r10 bl func_ov15_0214eabc @@ -55433,7 +55433,7 @@ _0214e3dc: rsb r0, r1, #0 add r1, sp, #0xb0 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, r7, asr #0x1f mov r1, r0, lsl #0x4 mov r0, #0x800 @@ -55446,7 +55446,7 @@ _0214e3dc: rsb r0, r1, #0 add r1, sp, #0xa4 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [r10, #0x64] ldr r0, [sp, #0x54] add r0, r1, r0 @@ -55599,11 +55599,11 @@ _0214e660: str r3, [sp, #0x3c] ldr r3, [r10, #0x98] str r3, [sp, #0x40] - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #0x34 add r2, sp, #0x28 add r0, r10, #0x60 - bl func_01ff9bc4 + bl Vec3p_Add ldrb r0, [r10, #0x1a8] cmp r0, #4 beq _0214e6e4 @@ -55616,7 +55616,7 @@ _0214e660: add r1, r10, #0x170 mov r3, r2 mov r0, #0xc00 - bl func_01ff9e64 + bl Vec3p_Axpy _0214e6e4: mov r0, r10 mov r1, #0 @@ -55980,14 +55980,14 @@ _0214ebf4: str r0, [sp, #0x1c] mov r0, r3 add r1, r8, #0x1c8 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] bl func_01ffa0f4 add r1, r8, #0x100 strh r0, [r1, #0xd4] add r0, sp, #0xc - bl func_01ff9cec + bl Vec3p_Length cmp r0, r6 bge _0214ec64 ldr r0, [sp, #0xc] @@ -56024,7 +56024,7 @@ _0214ecc4: add r0, r8, #0x1c8 add r1, r8, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x18 add r1, r8, #0x1c8 bl func_ov00_020ce2f0 @@ -56042,7 +56042,7 @@ _0214ecf8: add r0, r8, #0x1c8 add r1, r8, #0x48 strb r3, [r8, #0x1d6] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [r7, #4] ldr r0, [r7] @@ -56123,7 +56123,7 @@ func_ov15_0214edec: ; 0x0214edec add r0, r4, #0x48 add r1, sp, #0 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r3, r4, pc} .align 2, 0 @@ -56286,7 +56286,7 @@ _0214f010: mov r0, r10 mov r1, r9 mov r2, r10 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x30] ldr r1, [sp, #0x38] bl func_01ffa0f4 @@ -56294,7 +56294,7 @@ _0214f010: add r1, r1, #0x100 strh r0, [r1, #0x64] mov r0, r10 - bl func_01ff9cec + bl Vec3p_Length add r1, r7, r4, lsl #2 add r4, r4, #1 str r0, [r1, #0x178] @@ -56837,11 +56837,11 @@ _0214f7c4: str r3, [sp, #0x34] str ip, [sp, #0x38] str r11, [sp, #0x3c] - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 mov r0, r4 str r1, [sp, #0x2c] - bl func_01ff9cec + bl Vec3p_Length cmp r0, r6 add r8, r8, #1 movlt r6, r0 @@ -56867,7 +56867,7 @@ _0214f834: str r3, [sp, #0x34] str ip, [sp, #0x38] str r4, [sp, #0x3c] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [sp, #0x2c] ldr r0, [sp, #0x28] @@ -56881,7 +56881,7 @@ _0214f834: rsb r1, r2, r1, asr #16 mov r1, r1, lsl #0x10 mov r4, r1, lsr #0x10 - bl func_01ff9cec + bl Vec3p_Length mov r1, r4, asr #0x4 mov r2, r1, lsl #0x1 mov r1, r2, lsl #0x1 @@ -57032,7 +57032,7 @@ _0214fa80: mov r0, #0x24 mla r0, r3, r0, r5 add r0, r0, #4 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x54] cmp r0, #0 ldreq r0, [sp, #0x58] @@ -57042,24 +57042,24 @@ _0214fa80: beq _0214fbb8 mov r0, r6 add r1, sp, #0x48 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, sp, #0x18 mov r1, r11 add r2, sp, #0x30 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0xc mov r1, r11 add r2, sp, #0x24 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [sp, #0x28] str r0, [sp, #0x34] add r0, sp, #0x30 add r1, sp, #0x48 - bl func_01ff9c2c + bl Vec3p_Dot mov r5, r0 mov r0, r6 - bl func_01ff9cec + bl Vec3p_Length cmp r5, r0 bgt _0214fbb8 cmp r5, #0 @@ -57067,11 +57067,11 @@ _0214fa80: add r0, sp, #0x24 mov r1, r6 mov r2, r0 - bl func_01ff9c68 + bl Vec3p_Cross add r0, sp, #0x30 mov r1, r6 mov r2, r0 - bl func_01ff9c68 + bl Vec3p_Cross ldr r1, [sp, #0x34] ldr r0, [sp, #0x28] teq r1, r0 @@ -57326,11 +57326,11 @@ func_ov15_0214fea4: ; 0x0214fea4 add r0, sp, #0xc add r1, sp, #0x18 add r2, sp, #0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0 ldr r1, _0214ff44 ; =gPlayerPos mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0 ldmia r0, {r0, r1, r2} stmia r4, {r0, r1, r2} @@ -58165,7 +58165,7 @@ _02150a6c: mov r0, r3 mov r2, r3 add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x10] ldr r1, [sp, #0x18] bl func_01ffa0f4 @@ -58536,7 +58536,7 @@ func_ov15_02150fd8: ; 0x02150fd8 add r1, sp, #0 bl func_ov15_0214eb18 add r0, sp, #0 - bl func_01ff9cec + bl Vec3p_Length mov r1, r0, asr #0x4 add r0, r0, r1, lsr #27 movs r0, r0, asr #0x5 @@ -58575,7 +58575,7 @@ _0215102c: str r6, [sp] str r3, [sp, #4] str ip, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add _02151098: mov r0, r4 bl func_ov15_0214edec @@ -59269,9 +59269,9 @@ _02151938: str r3, [sp, #0x14] ldr r3, [r9, #0x50] str r3, [sp, #0x18] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r5 - bl func_01ff9cec + bl Vec3p_Length mov r4, r0 cmp r4, #0x1000 bge _02151a20 @@ -59291,11 +59291,11 @@ _02151938: mov r0, r6 mov r1, r5 mov r2, r6 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r11 mov r1, r5 mov r2, r11 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x1c] str r0, [r8, #0x48] ldr r0, [sp, #0x20] @@ -59475,7 +59475,7 @@ func_ov15_02151b40: ; 0x02151b40 add r0, sp, #0x3c add r1, sp, #4 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #8] mov r1, #0 str r0, [sp, #0x2c] @@ -60307,7 +60307,7 @@ func_ov15_02152694: ; 0x02152694 add r0, r1, #0x400 add r2, sp, #0x18 add r1, r3, #0x400 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] bl func_01ffa0f4 @@ -60321,7 +60321,7 @@ func_ov15_02152694: ; 0x02152694 mov r3, #0 mov r0, ip str r3, [sp, #0x10] - bl func_01ff9cec + bl Vec3p_Length mov r1, r0 ldr r0, [sp, #0x1c] bl func_01ffa0f4 @@ -60343,10 +60343,10 @@ func_ov15_02152694: ; 0x02152694 mov r2, r0 add r1, r1, #0x400 str r3, [sp, #0x2c] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x24 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, sp, #0x24 mov r1, #0x1000 bl func_01fffbec @@ -60354,7 +60354,7 @@ func_ov15_02152694: ; 0x02152694 add r1, r4, #0xc4 mov r2, r0 add r1, r1, #0x400 - bl func_01ff9bc4 + bl Vec3p_Add _0215279c: mvn r0, #0 str r0, [sp] @@ -60487,7 +60487,7 @@ _021528d0: add r1, sp, #4 mov r2, r0 str r3, [sp, #0xc] - bl func_01ff9bc4 + bl Vec3p_Add add r1, r6, #0x388 str r1, [sp] ldr r0, _021529d0 ; =data_027e0fe8 @@ -61325,7 +61325,7 @@ _02153530: bl func_ov00_020a61ac add r0, sp, #4 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize ldrb r0, [r5, #0x448] ldr r2, [r5, #0x3d0] mov r3, #0x10 @@ -61806,7 +61806,7 @@ _02153ba8: mov r2, r0 str r6, [sp, #0xac] str r3, [sp, #0xb0] - bl func_01ff9bc4 + bl Vec3p_Add mvn r0, #0 str r0, [sp] mov r0, #0 @@ -61959,7 +61959,7 @@ _02153d74: ldr r1, _02153f90 ; =gPlayerPos add r0, sp, #0x48 add r2, r5, #0x358 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, _02153f80 ; =data_027e0fac add r0, r5, #0x4c ldrsh r1, [r1] @@ -62057,7 +62057,7 @@ func_ov15_02153f94: ; 0x02153f94 ldr r1, _0215417c ; =gPlayerPos add r0, sp, #0x30 add r2, r5, #0x358 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02154188 ; =data_027e0fac add r1, r5, #0x300 ldrsh r2, [r0] @@ -62416,7 +62416,7 @@ _02154490: bl func_ov00_020a61ac add r0, sp, #0x34 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize mov r2, #0x100 add r0, r5, #0x3d8 mov r1, #0 @@ -62712,7 +62712,7 @@ func_ov15_021548c4: ; 0x021548c4 mov r0, ip mov r2, ip str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x48] ldr r1, [sp, #0x50] bl func_01ffa0f4 @@ -62752,7 +62752,7 @@ func_ov15_021548c4: ; 0x021548c4 add r0, sp, #0x3c add r1, sp, #0xc add r2, r6, #0x358 - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, [r6, #0x20] ldr r1, [r6, #0x358] add r0, r6, #0x300 @@ -62903,7 +62903,7 @@ func_ov15_02154ba4: ; 0x02154ba4 mov r3, r2 mov r0, #0x1e000 str r7, [sp, #0x18] - bl func_01ff9e64 + bl Vec3p_Axpy _02154c40: ldr r1, _0215520c ; =gPlayerPos add r0, sp, #0x1c @@ -62915,7 +62915,7 @@ _02154c40: add r1, sp, #4 mov r2, r0 str r3, [sp, #0xc] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x1c] ldr r1, [sp, #0x24] bl func_01ffa0f4 @@ -62966,7 +62966,7 @@ _02154d1c: _02154d24: add r0, sp, #0x28 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize mov r0, #0x800 str r0, [sp] add r1, sp, #0x28 @@ -63031,7 +63031,7 @@ _02154dd4: ldrsh r7, [r0, r1] _02154e24: add r0, sp, #0x28 - bl func_01ff9cec + bl Vec3p_Length smull r2, r1, r0, r7 adds r2, r2, #0x800 str r0, [r4, #0x3cc] @@ -63120,7 +63120,7 @@ _02154f3c: str r2, [sp, #0x28] str r1, [sp, #0x2c] str r3, [sp, #0x30] - bl func_01ff9cec + bl Vec3p_Length mov r2, #0x80 str r0, [r4, #0x3cc] mvn r0, #0x80000000 @@ -64516,7 +64516,7 @@ func_ov15_021562c4: ; 0x021562c4 mov r0, r3 mov r2, r3 add r1, r4, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #0x1c] ldr r2, [sp, #0x18] mov r1, r1, asr #0x1 @@ -64727,7 +64727,7 @@ func_ov15_0215658c: ; 0x0215658c add r2, sp, #8 mov r0, r3 add r1, r4, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0xc] ldr r2, [sp, #8] mov r0, r0, asr #0x1 @@ -65199,7 +65199,7 @@ func_ov15_02156b04: ; 0x02156b04 str r3, [sp, #0x28] ldr r3, [r6, #0x4c] str r3, [sp, #0x24] - bl func_01ff9bf8 + bl Vec3p_Sub ldrsh r0, [r6, #0x78] strh r0, [sp, #4] b _02156d4c @@ -65209,7 +65209,7 @@ _02156be4: add r2, sp, #0x14 add r0, r6, #0x2c8 add r1, r6, #0x2bc - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x14] ldr r1, [sp, #0x1c] bl func_01ffa0f4 @@ -65564,7 +65564,7 @@ _02157114: add r2, sp, #0 add r1, r10, #0x2c8 str r3, [sp, #0x14] - bl func_01ff9bf8 + bl Vec3p_Sub add r4, r10, #0x200 add r11, sp, #0xc add r5, sp, #0 @@ -65572,7 +65572,7 @@ _02157114: _0215716c: mov r0, r5 str r6, [sp, #4] - bl func_01ff9cec + bl Vec3p_Length cmp r0, r8 ble _021571ec add r0, r10, #0x200 @@ -65627,7 +65627,7 @@ _021571ec: ldr r3, [r3, #8] mov r2, r5 str r3, [sp, #0x14] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -65706,10 +65706,10 @@ _02157330: ldr r3, [r3, #8] mov r2, r5 str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r5 str r4, [sp, #0x1c] - bl func_01ff9cec + bl Vec3p_Length cmp r0, r8 bge _021573c0 sub r1, r7, #1 @@ -65745,7 +65745,7 @@ _021573c0: strh r0, [r1, #0xee] add r0, sp, #0x18 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r1, [sp, #0x18] ldr r0, [sp, #0x20] smull r2, r3, r1, r8 @@ -66123,7 +66123,7 @@ func_ov15_02157844: ; 0x02157844 strh r3, [ip, #0x10] ldrsh r3, [lr] strh r3, [r4, #0x78] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r4, #0x1fc bl func_01fffb4c mov r0, r4 @@ -66165,12 +66165,12 @@ func_ov15_021578e0: ; 0x021578e0 add r0, sp, #0x50 add r2, sp, #0x44 add r1, r4, #0x1e4 - bl func_01ff9bf8 + bl Vec3p_Sub mov r2, #0 add r0, sp, #0x44 add r1, r4, #0x1fc str r2, [sp, #0x48] - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 blt _02157b1c cmp r0, r5 @@ -67523,7 +67523,7 @@ _02158c04: mov r1, #0 mov r0, r3 str r1, [sp, #0x1c] - bl func_01ff9cec + bl Vec3p_Length str r0, [r5, #0x2e0] add r0, r5, #0x1e4 mov r1, #4 @@ -68410,7 +68410,7 @@ func_ov15_021597d0: ; 0x021597d0 orr r6, r6, r5, lsl #20 add r3, r3, r6 str r3, [sp, #0xc] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #4] ldr r1, [sp, #0xc] bl func_01ffa0f4 @@ -68907,7 +68907,7 @@ _02159ea0: mov r2, r1 add r0, r0, #0x48 str r3, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp] ldr r1, _0215a1ac ; =gMapManager ldr r0, [r0, #0x48] @@ -71938,11 +71938,11 @@ _0215c95c: add r0, sp, #0x48 add r1, sp, #0x54 mov r2, r11 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [sp, #0x34] mov r0, r11 - bl func_01ff9cec + bl Vec3p_Length str r0, [sp, #8] mov r0, r11 bl func_01fffb4c @@ -71957,10 +71957,10 @@ _0215c95c: ldr r3, [r10, #8] add r2, sp, #0x3c str r3, [sp, #0x14] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x3c mov r1, r11 - bl func_01ff9c2c + bl Vec3p_Dot movs r4, r0 bmi _0215ca60 ldr r0, [sp, #8] @@ -72011,11 +72011,11 @@ _0215ca78: add r0, sp, #0x3c mov r1, r10 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [sp, #0x40] add r0, sp, #0x3c - bl func_01ff9cec + bl Vec3p_Length ldr r1, [sp, #4] cmp r0, r1 bge _0215cae8 @@ -72271,7 +72271,7 @@ _0215cda8: add r0, sp, #0x18 add r1, sp, #0xc add r2, sp, #0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r5, [sp, #0xc] ldr r3, [sp, #0x10] ldr r2, [sp, #0x14] @@ -72335,7 +72335,7 @@ func_ov15_0215cef8: ; 0x0215cef8 ldr r0, _0215cf34 ; =gPlayerPos add r2, sp, #0 add r1, r1, #0x14 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 ldmia r0, {r0, r1, r2} stmia r4, {r0, r1, r2} @@ -72360,7 +72360,7 @@ func_ov15_0215cf38: ; 0x0215cf38 mov r1, #0 mov r0, r3 str r1, [sp, #0x10] - bl func_01ff9cec + bl Vec3p_Length add sp, sp, #0x18 ldmia sp!, {r3, pc} arm_func_end func_ov15_0215cf38 @@ -73875,7 +73875,7 @@ _0215e1b4: add r0, r6, #0x48 add r2, r6, #0x3ac str r3, [r6, #0x50] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r6, #0x300 strh r4, [r0, #0xdc] sub r0, r4, #0x8000 @@ -74428,7 +74428,7 @@ _0215ea34: add r0, r9, #0x48 add r1, r9, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r9, #0x6c] ldr r1, [r9, #0x64] rsb r0, r0, r0, lsl #4 @@ -74802,7 +74802,7 @@ _0215ef7c: add r0, r9, #0x48 add r1, r9, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r9, #0x48] ldr r0, _0215f7b8 ; =gMapManager str r1, [sp, #0x40] @@ -75429,7 +75429,7 @@ func_ov15_0215f8b0: ; 0x0215f8b0 add r0, r6, #0x48 add r1, r6, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r6, #0x64] cmp r0, #0 ldrb r0, [r6, #0x3ec] @@ -75566,7 +75566,7 @@ func_ov15_0215fa90: ; 0x0215fa90 add r2, sp, #0 add r0, r5, #0x48 add r1, ip, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -76836,7 +76836,7 @@ _02160b18: mov r0, r3 mov r2, r3 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x50] ldr r1, [sp, #0x58] bl func_01ffa0f4 @@ -77364,7 +77364,7 @@ func_ov15_021612bc: ; 0x021612bc add r1, sp, #0 bl func_ov15_0214eb18 add r0, sp, #0 - bl func_01ff9cec + bl Vec3p_Length mov r1, r0, asr #0x4 add r0, r0, r1, lsr #27 movs r0, r0, asr #0x5 @@ -77403,7 +77403,7 @@ _02161310: str r6, [sp] str r3, [sp, #4] str ip, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add _0216137c: mov r0, r4 bl func_ov15_0214edec @@ -78608,7 +78608,7 @@ _021623c4: mov r0, r3 mov r2, r3 add r1, r10, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x20] ldr r1, [sp, #0x28] bl func_01ffa0f4 @@ -79380,7 +79380,7 @@ _02162f28: add r3, r2, #0xda bl func_ov15_0214eb18 add r0, sp, #0xdc - bl func_01ff9cec + bl Vec3p_Length mov r1, r0, asr #0x4 add r0, r0, r1, lsr #27 mov r3, r0, asr #0x5 @@ -79417,7 +79417,7 @@ _02162f64: mov r5, r5, lsr #0xc orr r5, r5, r3, lsl #20 str r5, [sp, #0xe4] - bl func_01ff9bc4 + bl Vec3p_Add bl func_ov15_0215b780 cmp r0, #0 bne _02163050 @@ -79534,11 +79534,11 @@ _02163180: ldr r0, _02163c4c ; =gPlayerPos add r2, sp, #0xd0 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0xd0 str r1, [sp, #0xd4] - bl func_01ff9cec + bl Vec3p_Length mov r5, r0 bl func_ov15_0215b780 cmp r0, #0 @@ -79625,7 +79625,7 @@ _02163238: add r1, sp, #0xc4 mov r2, r0 str r3, [sp, #0xc4] - bl func_01ff9bc4 + bl Vec3p_Add b _021632fc _021632f0: mov r0, r4 @@ -79684,7 +79684,7 @@ _02163338: mov r5, r5, lsr #0xc orr r5, r5, r3, lsl #20 str r5, [r4, #0x68] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 bl func_ov15_02164478 cmp r0, #0 @@ -79768,7 +79768,7 @@ _0216346c: mov r5, r5, lsr #0xc orr r5, r5, r3, lsl #20 str r5, [r4, #0x68] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x234] cmp r0, #0 bne _02163718 @@ -79963,7 +79963,7 @@ _02163774: add r1, sp, #0x74 mov r2, r0 str r5, [sp, #0x74] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02163c70 ; =data_027e0ff8 add r1, r4, #8 ldr r0, [r0] @@ -79973,7 +79973,7 @@ _02163774: add r0, r4, #0x48 add r1, sp, #0x74 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x234] cmp r0, #0 bne _0216391c @@ -80196,7 +80196,7 @@ _02163b1c: mov ip, ip, lsr #0xc orr ip, ip, r3, lsl #20 str ip, [r4, #0x68] - bl func_01ff9bc4 + bl Vec3p_Add _02163b90: mov r0, r4 bl _ZN5Actor12ApplyGravityEv @@ -81408,7 +81408,7 @@ func_ov15_02164cc4: ; 0x02164cc4 add r0, sp, #4 mov r1, r5 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02164e58 ; =data_027e0e58 add r2, sp, #4 ldr r0, [r0] @@ -81427,7 +81427,7 @@ func_ov15_02164cc4: ; 0x02164cc4 add r0, sp, #4 mov r1, r5 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02164e58 ; =data_027e0e58 add r2, sp, #4 ldr r0, [r0] @@ -81446,7 +81446,7 @@ func_ov15_02164cc4: ; 0x02164cc4 add r0, sp, #4 mov r1, r5 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02164e58 ; =data_027e0e58 add r2, sp, #4 ldr r0, [r0] @@ -81459,7 +81459,7 @@ func_ov15_02164cc4: ; 0x02164cc4 add r0, sp, #4 mov r1, r5 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02164e58 ; =data_027e0e58 add r1, r6, #0x27c ldr r0, [r0] @@ -83036,7 +83036,7 @@ func_ov15_0216629c: ; 0x0216629c add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 mov r1, #2 mov r2, #0 @@ -83496,7 +83496,7 @@ func_ov15_02166884: ; 0x02166884 mov r0, r3 mov r2, r3 add r1, r4, #0x18 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02166904 ; =data_027e0e58 add r2, sp, #0 ldr r0, [r0] @@ -83903,7 +83903,7 @@ _02166d48: ldr r0, _02166ee8 ; =gPlayerPos add r1, sp, #0x1c add r2, r5, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r5, #0x48] ldr r0, _02166eec ; =gMapManager str r1, [sp, #0x10] @@ -84093,7 +84093,7 @@ _02166f44: addeq sp, sp, #0x34 ldmeqia sp!, {r3, r4, r5, r6, pc} add r0, sp, #0x10 - bl func_01ff9cec + bl Vec3p_Length mov r5, r0 ldr r3, [sp, #0x10] ldr r2, [sp, #0x14] @@ -84111,7 +84111,7 @@ _02166f44: add r0, r4, #0x60 add r1, sp, #4 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0x34 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 @@ -85222,7 +85222,7 @@ _02167fa4: str ip, [sp, #0x34] str r5, [sp, #0x38] str r3, [sp, #0x3c] - bl func_01ff9bf8 + bl Vec3p_Sub add sp, sp, #0x40 ldmia sp!, {r3, r4, r5, pc} _02167fe0: @@ -85307,7 +85307,7 @@ _02168098: add r1, r4, #0x48 add r2, r4, #0x60 str r3, [sp, #0x2c] - bl func_01ff9bf8 + bl Vec3p_Sub add sp, sp, #0x40 ldmia sp!, {r3, r4, r5, pc} _02168128: @@ -85396,7 +85396,7 @@ _021681e8: add r1, r4, #0x48 add r2, r4, #0x60 str r3, [sp, #0x20] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r4 str r5, [r4, #0x64] bl _ZN5Actor12ApplyGravityEv @@ -86281,7 +86281,7 @@ func_ov15_02168e60: ; 0x02168e60 add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 bl _ZN5Actor20IncreaseActiveFramesEv mov r0, r5 @@ -86323,7 +86323,7 @@ func_ov15_02168efc: ; 0x02168efc add r2, sp, #0 add r0, r4, #0x48 add r1, ip, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -89330,7 +89330,7 @@ _0216b6cc: ldr r3, [r9, #0x50] mov r2, r4 str r3, [sp, #0x38] - bl func_01ff9bc4 + bl Vec3p_Add str r10, [sp] ldr r0, [r11] mov r1, r4 @@ -90723,7 +90723,7 @@ _0216c9cc: add r0, r2, #0x400 add r2, r2, #0x400 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0xc4 add r0, r0, #0x400 add r3, sp, #0xc @@ -90736,7 +90736,7 @@ _0216c9cc: add r1, r4, #0xb8 mov r2, r0 add r1, r1, #0x400 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #0xc] mov r0, r4 str r1, [r4, #0x48] @@ -90845,7 +90845,7 @@ _0216cb84: strge r0, [r4, #0x488] bge _0216cbb4 ldr r0, [r4, #0x4c4] - bl func_02042f74 + bl abs cmp r0, #0x3000 blt _0216cbb4 mov r0, r4 @@ -90900,13 +90900,13 @@ _0216cc54: add r0, r4, #0x168 bl func_ov00_020c5e20 ldr r0, [r4, #0x60] - bl func_02042f74 + bl abs cmp r0, #0xcd movge r0, #2 strge r0, [r4, #0x488] bge _0216cd44 ldr r0, [r4, #0x4c4] - bl func_02042f74 + bl abs cmp r0, #0x3000 blt _0216cd44 mov r0, r4 @@ -90957,7 +90957,7 @@ _0216cd04: b _0216cd44 _0216cd2c: ldr r0, [r4, #0x4c4] - bl func_02042f74 + bl abs cmp r0, #0x3000 blt _0216cd44 mov r0, r4 @@ -90973,7 +90973,7 @@ _0216cd44: add r0, r2, #0x400 add r2, r2, #0x400 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0xc4 add r0, r0, #0x400 add r3, sp, #0xc @@ -90986,7 +90986,7 @@ _0216cd44: add r1, r4, #0xb8 mov r2, r0 add r1, r1, #0x400 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #0xc] mov r0, r4 str r1, [r4, #0x48] @@ -91314,7 +91314,7 @@ func_ov15_0216d120: ; 0x0216d120 add r1, sp, #0x14 add r0, sp, #8 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #2 str r0, [sp] ldr r0, _0216d248 ; =data_027e0e58 @@ -91359,7 +91359,7 @@ func_ov15_0216d258: ; 0x0216d258 add r1, sp, #0x18 add r0, sp, #0xc mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x164] cmp r0, #0 beq _0216d30c @@ -91453,7 +91453,7 @@ func_ov15_0216d3c4: ; 0x0216d3c4 str r3, [sp, #0x14] ldr r3, [ip, #0x30c] str r3, [sp, #0x18] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 add r1, r4, #0x8c mov r2, r0 @@ -91467,7 +91467,7 @@ func_ov15_0216d3c4: ; 0x0216d3c4 b _0216d4dc _0216d434: ldr r0, [sp] - bl func_02042f74 + bl abs ldr r2, [sp, #0x18] add r1, r2, #0x200 cmp r0, r1 @@ -91490,7 +91490,7 @@ _0216d434: ldmia sp!, {r3, r4, pc} _0216d48c: ldr r0, [sp, #4] - bl func_02042f74 + bl abs ldr r2, [sp, #0x18] add r1, r2, #0x200 cmp r0, r1 @@ -91702,7 +91702,7 @@ func_ov15_0216d6e8: ; 0x0216d6e8 add r1, sp, #0x24 mov r0, r4 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 add r1, sp, #0x30 add r2, sp, #0 @@ -92869,7 +92869,7 @@ func_ov15_0216e69c: ; 0x0216e69c add r0, sp, #0x44 ldr r1, [sp, #0x10] mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldrh r1, [r5, #0x64] ldr r3, _0216e974 ; =data_02050f54 add r0, sp, #0x20 @@ -93637,7 +93637,7 @@ _0216f158: str ip, [r4, #0x4c] ldr r3, [r3, #8] str r3, [r4, #0x50] - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x15c bl func_ov00_020c5e20 ldr r0, _0216f324 ; =gAdventureFlags @@ -96774,7 +96774,7 @@ _02171e28: strhs r0, [r4, #0x550] add r0, r4, #0x48 add r1, r4, #0x54 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #4] ldr r1, [sp, #0xc] bl func_01ffa0f4 @@ -96940,9 +96940,9 @@ func_ov15_02172070: ; 0x02172070 add r2, sp, #0 add r0, r4, #0x48 add r1, r4, #0x54 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 - bl func_01ff9cec + bl Vec3p_Length ldr r2, [r4, #0x130] mov r1, r0 cmp r2, #5 @@ -97184,16 +97184,16 @@ func_ov15_02172260: ; 0x02172260 add r0, sp, #0x28 add r2, sp, #0x1c str r3, [sp, #0x30] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x1c bl func_01fffb4c ldr r0, [sp] add r1, sp, #0x34 add r2, sp, #0x10 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x10 add r1, sp, #0x1c - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 blt _021724b8 ldr r1, _021724cc ; =0x00003266 @@ -97202,7 +97202,7 @@ func_ov15_02172260: ; 0x02172260 mov r1, #0 add r0, sp, #0x10 str r1, [sp, #0x14] - bl func_01ff9cec + bl Vec3p_Length mov r5, r0 ldr r0, [sp, #0x10] ldr r1, [sp, #0x18] @@ -97288,7 +97288,7 @@ func_ov15_021724d0: ; 0x021724d0 ldr r0, _021725c8 ; =gPlayerPos add r2, sp, #0 add r1, r4, #0x54 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, _021725c4 ; =gPlayer add r2, sp, #0 ldr r0, [r0] @@ -97760,7 +97760,7 @@ _02172b80: add r0, sp, #0x14 mov r1, r3 mov r2, r3 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x78 str r0, [sp] ldr r1, _02172cb4 ; =func_ov15_0216f4a0 @@ -98486,11 +98486,11 @@ func_ov15_021735a8: ; 0x021735a8 add r0, sp, #0x18 add r1, sp, #0x24 mov r2, r5 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 add r1, sp, #0x30 mov r2, r5 - bl func_01ff9bc4 + bl Vec3p_Add ldr r3, _02173718 ; =gMapManager add r8, sp, #0xc ldmia r5, {r0, r1, r2} @@ -99115,11 +99115,11 @@ func_ov15_02173cb4: ; 0x02173cb4 orr r5, r5, r3, lsl #20 str r7, [sp, #0x1c] str r5, [sp, #0x24] - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x34 add r1, sp, #0x6c add r2, sp, #0x28 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r7, [sp, #0x2c] mov r0, #0 str r0, [sp, #0x2c] @@ -99129,7 +99129,7 @@ func_ov15_02173cb4: ; 0x02173cb4 mov r0, r0, lsl #0x10 mov r6, r0, asr #0x10 add r0, sp, #0x28 - bl func_01ff9cec + bl Vec3p_Length ldr r1, _02173ff4 ; =0x00010a68 mov r2, #0 umull r5, r3, r0, r1 @@ -100857,7 +100857,7 @@ _0217549c: add r0, sp, #0x44 mov r1, r4 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r6, #0xb0] cmp r0, #0 beq _02175574 @@ -100937,7 +100937,7 @@ _021755fc: add r0, sp, #0x44 mov r1, r4 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r6, #0xb4] cmp r0, #0 beq _021756a8 @@ -101015,7 +101015,7 @@ _02175730: add r0, sp, #0x44 mov r1, r4 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r6, #0xb8] cmp r0, #0 beq _021757d4 @@ -101081,7 +101081,7 @@ _0217585c: add r0, sp, #0x44 mov r1, r4 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r6, #0xbc] cmp r0, #0 beq _021758d0 @@ -101214,7 +101214,7 @@ _02175994: add r0, sp, #0xc mov r1, r4 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r6, #0x180] cmp r0, #0 beq _02175ad4 @@ -101289,7 +101289,7 @@ func_ov15_02175b58: ; 0x02175b58 mov r2, r4 str r1, [r4, #8] add r1, r5, #0xa4 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4, #4] ldr r0, [r5, #0xa0] add r0, r1, r0 @@ -101395,7 +101395,7 @@ func_ov15_02175cc4: ; 0x02175cc4 add r0, sp, #0x30 add r1, sp, #0 mov r2, r4 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0x3c ldmia sp!, {r4, r5, pc} .align 2, 0 @@ -102143,7 +102143,7 @@ func_ov15_0217674c: ; 0x0217674c mvn r1, #0x13 cmp r0, r1 bgt _021767ec - bl func_02042f74 + bl abs sub r0, r0, #0x12 cmp r0, #0x20 movgt r0, #0x20 @@ -102218,7 +102218,7 @@ _02176858: cmp r0, #0 beq _021768a8 ldr r0, [r4, #0x3c4] - bl func_02042f74 + bl abs cmp r0, #0x32 bge _0217689c ldr r0, _02176900 ; =data_ov00_020eec9c @@ -104320,7 +104320,7 @@ _021784d0: add r0, sp, #0x50 add r1, sp, #0x20 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, _02178994 ; =data_ov15_02186d80 add r0, sp, #0x44 ldr r3, [r1, #0x1a8] @@ -104334,7 +104334,7 @@ _021784d0: add r0, sp, #0x44 add r1, sp, #0x20 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, _02178994 ; =data_ov15_02186d80 add r0, sp, #0x38 ldr r2, [r1, #0x1b4] @@ -104348,7 +104348,7 @@ _021784d0: add r0, sp, #0x38 add r1, sp, #0x20 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, _02178994 ; =data_ov15_02186d80 add r0, sp, #0x2c ldr r2, [r1, #0x1c0] @@ -104362,7 +104362,7 @@ _021784d0: add r0, sp, #0x2c add r1, sp, #0x20 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -105451,27 +105451,27 @@ func_ov15_0217934c: ; 0x0217934c add r2, sp, #0x40 str r3, [sp, #0x98] str r3, [sp, #0xc0] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x88 add r1, sp, #0xbc add r2, sp, #0x34 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x7c add r1, sp, #0xbc add r2, sp, #0x28 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x40 add r1, sp, #0x34 add r2, sp, #0x1c - bl func_01ff9c68 + bl Vec3p_Cross add r0, sp, #0x34 add r1, sp, #0x28 add r2, sp, #0x10 - bl func_01ff9c68 + bl Vec3p_Cross add r0, sp, #0x28 add r1, sp, #0x40 add r2, sp, #4 - bl func_01ff9c68 + bl Vec3p_Cross ldr r1, [sp, #0x20] cmp r1, #0 ldrlt r0, [sp, #0x14] @@ -106667,7 +106667,7 @@ func_ov15_0217a734: ; 0x0217a734 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, _0217a790 ; =data_ov15_0218ddcc ldr r2, _0217a794 ; =data_ov15_0218ddc8 add r0, r4, #0x48 @@ -106727,7 +106727,7 @@ func_ov15_0217a79c: ; 0x0217a79c add r0, sp, #0x24 add r1, r4, #0x48 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0217a84c ; =data_027e0e58 add r1, r4, #0x3b4 ldr r0, [r0] @@ -107693,7 +107693,7 @@ _0217b4f4: add r0, r5, #0x2ac add r1, r5, #0x48 add r2, r5, #0x7c - bl func_01ff9bf8 + bl Vec3p_Sub ldrsh r1, [r5, #0x78] ldr r3, _0217b7b8 ; =data_02050f54 add r0, sp, #8 @@ -108256,7 +108256,7 @@ _0217bc8c: add r1, sp, #0x24 add r2, sp, #0x30 add r0, r6, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add mvn r0, #0 add r1, sp, #4 str r0, [sp, #4] @@ -109076,7 +109076,7 @@ _0217c7a4: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 bl func_ov15_0217d550 _0217c7d4: @@ -109278,7 +109278,7 @@ func_ov15_0217ca04: ; 0x0217ca04 sub r3, r3, r1 add r1, r4, #0x2d0 str r3, [r4, #0x2e0] - bl func_01ff9bc4 + bl Vec3p_Add add r2, r4, #0x200 ldrsh r0, [r2, #0xe4] ldr r8, _0217ceac ; =data_02050f54 @@ -109338,7 +109338,7 @@ func_ov15_0217ca04: ; 0x0217ca04 ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0x1c] - bl func_01ff9bc4 + bl Vec3p_Add ldr r5, _0217ceb4 ; =0xfffff8cd ldr r3, _0217ceb8 ; =0x00000d71 ldr r2, _0217cebc ; =0xfffffb33 @@ -109517,7 +109517,7 @@ _0217ce00: add r2, sp, #0x20 add r1, r4, #0x2d0 str r3, [r4, #0x64] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0217cea4 ; =data_027e0fac add r2, r4, #0x200 ldrsh r3, [r0] @@ -110643,7 +110643,7 @@ func_ov15_0217dc4c: ; 0x0217dc4c add r0, sp, #0xc add r1, sp, #0 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x15c ldr r3, [r0] add r1, sp, #0x18 @@ -114322,11 +114322,11 @@ _02180e68: add r2, sp, #0x4c mov r0, r3 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0x4c str r1, [sp, #0x50] - bl func_01ff9cec + bl Vec3p_Length mov r5, r0 ldr r2, _02181364 ; =data_027e0fac ldr r0, [sp, #0x4c] @@ -114482,7 +114482,7 @@ _021810e4: add r0, sp, #0x58 add r1, sp, #0x40 add r2, sp, #0x20 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r7, lsl #0x10 mov r0, r0, lsr #0x10 mov r0, r0, asr #0x4 @@ -116033,11 +116033,11 @@ func_ov15_021826ac: ; 0x021826ac mov r2, r5 str r3, [sp, #0x18] str r3, [sp, #0x1c] - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #0x30 mov r0, r5 mov r2, r5 - bl func_01ff9bc4 + bl Vec3p_Add ldr r3, _02182808 ; =gMapManager add r7, sp, #0xc ldmia r5, {r0, r1, r2} @@ -116242,7 +116242,7 @@ func_ov15_021829f0: ; 0x021829f0 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x354 add r1, r4, #0x48 bl func_ov00_020c6f08 @@ -117625,9 +117625,9 @@ func_ov15_02183bc4: ; 0x02183bc4 add r1, sp, #0 mov r2, r0 str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0xc - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0xc000 addlt sp, sp, #0x18 movlt r0, #1 @@ -118070,7 +118070,7 @@ _02184218: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r4, r5, pc} .align 2, 0 @@ -118923,7 +118923,7 @@ func_ov15_02184c10: ; 0x02184c10 str r3, [sp, #0x38] str r2, [sp, #0x3c] str r1, [sp, #0x40] - bl func_01ff9cec + bl Vec3p_Length mov r4, r0 add r0, sp, #0x38 bl func_01fffb4c diff --git a/asm/ov17.inc b/asm/ov17.inc index 7fc0b7a6..b72d0c1a 100644 --- a/asm/ov17.inc +++ b/asm/ov17.inc @@ -137,9 +137,9 @@ .extern func_01ff991c .extern func_01ff9b4c .extern func_01ff9b88 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffa9fc diff --git a/asm/ov17.s b/asm/ov17.s index beb251ae..a84dbc42 100644 --- a/asm/ov17.s +++ b/asm/ov17.s @@ -1102,7 +1102,7 @@ func_ov17_0215bf8c: ; 0x0215bf8c str r2, [sp, #0x34] mov r0, ip mov r2, ip - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0x1000 ldr r1, _0215c0f8 ; =0x00001333 str r0, [sp, #0x20] @@ -1111,7 +1111,7 @@ func_ov17_0215bf8c: ; 0x0215bf8c str r1, [sp, #0x24] add r1, sp, #0x20 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #7 @@ -1480,7 +1480,7 @@ _0215c4ec: add r0, sp, #0x4c add r1, sp, #0x40 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #4 str r0, [sp] ldr r0, _0215c65c ; =data_027e0e58 @@ -2482,11 +2482,11 @@ _0215d1ec: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x48 add r1, r4, #0x208 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r3, _0215d478 ; =data_027e0d0c ldr r1, _0215d47c ; =gMapManager ldr r2, [r3] @@ -2838,7 +2838,7 @@ func_ov17_0215d6c0: ; 0x0215d6c0 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4, #0x4c] ldr r0, [r4, #0x1f4] cmp r1, r0 @@ -3124,7 +3124,7 @@ _0215da20: mov r3, r2 str r0, [sp, #0x2c] mov r0, #0x1ec - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, [r4, #0x214] cmp r0, #0 beq _0215db48 @@ -3165,7 +3165,7 @@ _0215db54: mov r3, r2 str ip, [sp, #0x20] rsb r0, r0, #0 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, [r4, #0x218] cmp r0, #0 beq _0215dbe4 @@ -3205,7 +3205,7 @@ _0215dbf0: mov r3, r2 str r0, [sp, #0x14] mov r0, #0xcd - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, [r4, #0x21c] cmp r0, #0 beq _0215dc7c @@ -3246,7 +3246,7 @@ _0215dc88: mov r3, r2 str r0, [sp, #8] mvn r0, #0xcc - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, [r4, #0x220] cmp r0, #0 beq _0215dd18 @@ -3487,13 +3487,13 @@ _0215dfd4: .word data_ov00_020e9370 .global func_ov17_0215dfd8 arm_func_start func_ov17_0215dfd8 func_ov17_0215dfd8: ; 0x0215dfd8 - ldr ip, _0215dfec ; =func_01ff9bc4 + ldr ip, _0215dfec ; =Vec3p_Add mov r2, r0 add r0, r2, #0x208 add r2, r2, #0x208 bx ip .align 2, 0 -_0215dfec: .word func_01ff9bc4 +_0215dfec: .word Vec3p_Add arm_func_end func_ov17_0215dfd8 .global func_ov17_0215dff0 @@ -4339,11 +4339,11 @@ _0215eb90: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x48 add r1, r4, #0x244 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0215ee50 ; =data_027e0d0c ldr r1, [r0] str r1, [r4, #0x244] @@ -4670,13 +4670,13 @@ _0215f02c: .word data_ov00_020e9370 .global func_ov17_0215f030 arm_func_start func_ov17_0215f030 func_ov17_0215f030: ; 0x0215f030 - ldr ip, _0215f044 ; =func_01ff9bc4 + ldr ip, _0215f044 ; =Vec3p_Add mov r2, r0 add r0, r2, #0x244 add r2, r2, #0x244 bx ip .align 2, 0 -_0215f044: .word func_01ff9bc4 +_0215f044: .word Vec3p_Add arm_func_end func_ov17_0215f030 .global func_ov17_0215f048 @@ -4976,11 +4976,11 @@ _0215f3fc: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x48 add r1, r4, #0x228 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, _0215f708 ; =data_027e0d0c mov r0, r4 ldr r2, [r1] @@ -5285,13 +5285,13 @@ _0215f858: .word data_ov00_020e9370 .global func_ov17_0215f85c arm_func_start func_ov17_0215f85c func_ov17_0215f85c: ; 0x0215f85c - ldr ip, _0215f870 ; =func_01ff9bc4 + ldr ip, _0215f870 ; =Vec3p_Add mov r2, r0 add r0, r2, #0x228 add r2, r2, #0x228 bx ip .align 2, 0 -_0215f870: .word func_01ff9bc4 +_0215f870: .word Vec3p_Add arm_func_end func_ov17_0215f85c .global func_ov17_0215f874 @@ -6918,7 +6918,7 @@ _02160b10: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r4, [r5, #0x64] cmp r4, #0 addge sp, sp, #0x20 @@ -6992,7 +6992,7 @@ _02160c28: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r4, [r5, #0x64] cmp r4, #0 bge _02160d68 @@ -7264,7 +7264,7 @@ func_ov17_02160fa4: ; 0x02160fa4 add r1, r4, #0x48 str r3, [r4, #0x1c0] moveq r6, #0x14 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #8] mov r1, r6 bl func_02002c14 @@ -8020,11 +8020,11 @@ func_ov17_02161918: ; 0x02161918 add r0, sp, #0x58 add r1, sp, #0x40 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x58 add r1, sp, #0x34 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #4 str r0, [sp] ldr r0, _02161a68 ; =data_027e0e58 @@ -9988,7 +9988,7 @@ func_ov17_02163254: ; 0x02163254 mov r0, r4 mov r2, r4 add r1, r5, #0x18 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #4] add r0, r0, #0x66 add r0, r0, #0x600 @@ -10430,7 +10430,7 @@ func_ov17_021637a8: ; 0x021637a8 str ip, [sp, #0x2c] str r3, [sp, #0x30] str ip, [sp, #0x34] - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0x800 add r0, sp, #0x38 str r1, [sp, #0x20] @@ -10438,7 +10438,7 @@ func_ov17_021637a8: ; 0x021637a8 str r1, [sp, #0x28] add r1, sp, #0x20 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #9 @@ -10876,7 +10876,7 @@ func_ov17_02163d2c: ; 0x02163d2c str r2, [sp, #0x1c] mov r0, ip mov r2, ip - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0x800 ldr r1, _02163e20 ; =0x00000b33 str r0, [sp, #8] @@ -10885,7 +10885,7 @@ func_ov17_02163d2c: ; 0x02163d2c str r1, [sp, #0xc] add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #9 @@ -11644,11 +11644,11 @@ _0216478c: add r0, sp, #0x38 add r1, r4, #0x18 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x2c add r1, r4, #0x18 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x6000 orr r0, r0, #0x2000 @@ -11691,7 +11691,7 @@ _0216478c: add r0, r4, #0x18 add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 ldr r3, [r0] mov r1, #0 @@ -11906,7 +11906,7 @@ func_ov17_02164aa4: ; 0x02164aa4 add r0, sp, #0 add r1, r4, #0x18 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x78 ldr r3, [r0] add r1, sp, #0xc @@ -14176,7 +14176,7 @@ func_ov17_02166634: ; 0x02166634 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #1 ldmia sp!, {r4, pc} arm_func_end func_ov17_02166634 @@ -14411,7 +14411,7 @@ func_ov17_02166878: ; 0x02166878 str r1, [sp, #0x30] str r1, [sp, #0x38] add r1, sp, #0x30 - bl func_01ff9bf8 + bl Vec3p_Sub ldrb r2, [r9, #0x7a] mov r1, #0x2000 mov r0, r4 @@ -14422,7 +14422,7 @@ func_ov17_02166878: ; 0x02166878 str r1, [sp, #0x2c] add r1, sp, #0x24 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f str r0, [sp, #8] @@ -15398,7 +15398,7 @@ func_ov17_021676ac: ; 0x021676ac str lr, [sp, #0x5c] str ip, [sp, #0x60] str lr, [sp, #0x64] - bl func_01ff9bf8 + bl Vec3p_Sub ldrb r1, [r4, #0x7a] add r0, sp, #0x68 mov r3, #0x2000 @@ -15408,7 +15408,7 @@ func_ov17_021676ac: ; 0x021676ac str ip, [sp, #0x50] str r3, [sp, #0x54] str ip, [sp, #0x58] - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x74 ldr ip, [sp, #4] add r3, sp, #0x38 @@ -15446,7 +15446,7 @@ _021677a8: str lr, [sp, #0x2c] str ip, [sp, #0x30] str lr, [sp, #0x34] - bl func_01ff9bf8 + bl Vec3p_Sub ldrb r1, [r4, #0x7a] add r0, sp, #0x68 mov r3, #0x2000 @@ -15457,7 +15457,7 @@ _021677a8: str ip, [sp, #0x20] str r3, [sp, #0x24] str ip, [sp, #0x28] - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x74 ldr ip, [sp, #4] add r3, sp, #8 @@ -16280,7 +16280,7 @@ func_ov17_0216826c: ; 0x0216826c mov r0, r4 mov r2, r4 add r1, sp, #0x30 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0x1000 str r0, [sp, #0x24] str r0, [sp, #0x2c] @@ -16289,7 +16289,7 @@ func_ov17_0216826c: ; 0x0216826c add r0, sp, #0x3c add r1, sp, #0x24 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f ldrh r1, [r10, #0x26] @@ -17375,7 +17375,7 @@ _02168fd4: str r4, [sp, #0x38] str r3, [sp, #0x3c] str r4, [sp, #0x40] - bl func_01ff9bf8 + bl Vec3p_Sub mov r2, r4 ldr r1, _02169184 ; =0x00001333 add r0, sp, #0x80 @@ -17384,7 +17384,7 @@ _02168fd4: str r2, [sp, #0x34] add r1, sp, #0x2c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #9 @@ -17641,7 +17641,7 @@ func_ov17_02169354: ; 0x02169354 add r1, sp, #0xc mov r0, r3 mov r2, r3 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0 mov r1, r5 bl func_01ff9ec0 @@ -17865,7 +17865,7 @@ _02169634: str ip, [sp, #0x3c] str r3, [sp, #0x40] str ip, [sp, #0x44] - bl func_01ff9bf8 + bl Vec3p_Sub mov r3, #0x800 add r0, sp, #0x48 add r1, sp, #0x30 @@ -17873,7 +17873,7 @@ _02169634: str r3, [sp, #0x30] str r3, [sp, #0x34] str r3, [sp, #0x38] - bl func_01ff9bc4 + bl Vec3p_Add ldrsh r0, [r4, #0xc] bl func_0202bbbc cmp r0, #3 @@ -18392,7 +18392,7 @@ func_ov17_02169d4c: ; 0x02169d4c add r0, sp, #0x20 add r1, r6, #0x18 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, _02169ebc ; =gActorManager ldr r2, _02169ec0 ; =0x42494752 ldr r1, [r1] @@ -19184,7 +19184,7 @@ func_ov17_0216a734: ; 0x0216a734 add r0, sp, #0x40 add r1, sp, #0x34 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #4 str r0, [sp] ldr r0, _0216a810 ; =data_027e0e58 @@ -19414,7 +19414,7 @@ func_ov17_0216a9fc: ; 0x0216a9fc str r3, [sp, #0x18] str ip, [sp, #0x14] str ip, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0x800 str r0, [sp, #8] str r0, [sp, #0x10] @@ -19423,7 +19423,7 @@ func_ov17_0216a9fc: ; 0x0216a9fc add r0, sp, #0x38 add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #9 diff --git a/asm/ov18.inc b/asm/ov18.inc index 6f96dd40..2f917e37 100644 --- a/asm/ov18.inc +++ b/asm/ov18.inc @@ -136,9 +136,9 @@ .extern func_01ff9a18 .extern func_01ff9a80 .extern func_01ff9b24 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9cec +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Length .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffa8d4 diff --git a/asm/ov18.s b/asm/ov18.s index 530ab1cb..2aae23cd 100644 --- a/asm/ov18.s +++ b/asm/ov18.s @@ -2459,7 +2459,7 @@ _0215d2e8: ldr r3, [r5, #0x50] mov r2, r0 str r3, [r5, #0x1a4] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0215d580 ; =data_ov18_0216c25c cmp r4, #0 ldr r2, [r0, #0x30] @@ -2483,7 +2483,7 @@ _0215d2e8: ldr r3, [r5, #0x50] mov r2, r0 str r3, [r5, #0x1b0] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r5, #0x1a8] ldr r2, _0215d580 ; =data_ov18_0216c25c str r0, [r5, #0x1b4] @@ -2504,7 +2504,7 @@ _0215d2e8: add r0, r5, #0x1b4 add r1, sp, #0xc mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r5, #0x1a8] ldr r2, _0215d580 ; =data_ov18_0216c25c str r0, [r5, #0x1c0] @@ -2525,7 +2525,7 @@ _0215d2e8: add r0, r5, #0x1c0 add r1, sp, #0xc mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldrh r0, [r5, #0x22] strb r0, [r5, #0x15c] ldr r0, [r5, #0x158] @@ -2842,7 +2842,7 @@ _0215d9a8: add r0, r5, #0x54 add r1, r5, #0x48 add r2, r5, #0x60 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [r5, #0x60] add r0, sp, #4 str r1, [sp, #4] @@ -2850,7 +2850,7 @@ _0215d9a8: str r1, [sp, #8] ldr r1, [r5, #0x68] str r1, [sp, #0xc] - bl func_01ff9cec + bl Vec3p_Length str r0, [r5, #0x174] ldr r0, [r5, #0x130] cmp r0, #1 @@ -3307,7 +3307,7 @@ _0215e018: add r2, sp, #0x38 add r0, r4, #0x178 add r1, r4, #0x190 - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #0x14 mov r2, #0 str r1, [sp] @@ -3902,7 +3902,7 @@ _0215e76c: ldr r3, [r4, #0x20] mov r2, r0 str r3, [sp, #0x7c] - bl func_01ff9bc4 + bl Vec3p_Add ldr r7, _0215ee60 ; =0x0000099a b _0215ecb8 _0215e7e4: @@ -3960,7 +3960,7 @@ _0215e830: mov r2, r0 add r5, r5, #0x1000 str r3, [sp, #0x7c] - bl func_01ff9bc4 + bl Vec3p_Add ldr r7, _0215ee60 ; =0x0000099a b _0215ecb8 _0215e8c4: @@ -4161,7 +4161,7 @@ _0215eb68: ldr r3, [r4, #0x20] mov r2, r0 str r3, [sp, #0x7c] - bl func_01ff9bc4 + bl Vec3p_Add ldr r7, _0215ee60 ; =0x0000099a b _0215ecb8 _0215ebbc: @@ -4589,7 +4589,7 @@ func_ov18_0215f090: ; 0x0215f090 str r3, [r4, #0xb4] ldr r3, [ip, #8] str r3, [r4, #0xb8] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4, #0xb8] mov r0, #1 add r1, r1, #0x800 @@ -4734,7 +4734,7 @@ func_ov18_0215f274: ; 0x0215f274 str ip, [sp, #0x14] str r3, [sp, #0x18] str ip, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _0215f380 ; =0x00000666 ldr r2, _0215f384 ; =0x00000ccd add r0, sp, #0x38 @@ -4743,7 +4743,7 @@ func_ov18_0215f274: ; 0x0215f274 str r1, [sp, #0x10] add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #6 @@ -5082,7 +5082,7 @@ _0215f6c8: str r6, [sp, #0x60] str r4, [sp, #0x64] str r3, [sp, #0x68] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x6c ldr r3, _0215f8f8 ; =0x0000059a mov r4, #0x1000 @@ -5091,7 +5091,7 @@ _0215f6c8: str r6, [sp, #0x54] str r4, [sp, #0x58] str r3, [sp, #0x5c] - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 bic r1, r1, #0x1f orr r1, r1, #6 @@ -5141,7 +5141,7 @@ _0215f6c8: str lr, [sp, #0x30] str r3, [sp, #0x34] str ip, [sp, #0x38] - bl func_01ff9bf8 + bl Vec3p_Sub ldr lr, _0215f8fc ; =0x00000199 add r0, sp, #0x6c sub r3, lr, #0x33 @@ -5151,7 +5151,7 @@ _0215f6c8: str lr, [sp, #0x24] str ip, [sp, #0x28] str r3, [sp, #0x2c] - bl func_01ff9bc4 + bl Vec3p_Add mov ip, #0 bic r1, ip, #0x1f orr r1, r1, #7 @@ -5444,7 +5444,7 @@ func_ov18_0215fb74: ; 0x0215fb74 str r4, [sp, #0x38] str r3, [sp, #0x3c] str r4, [sp, #0x40] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 bl func_ov18_0215fccc ldr r1, [r5, #0x18] @@ -5469,7 +5469,7 @@ func_ov18_0215fb74: ; 0x0215fb74 str ip, [sp, #0x4c] str r6, [sp, #0x2c] str r3, [sp, #0x30] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r6 str r0, [sp, #0x20] str r0, [sp, #0x24] @@ -5478,7 +5478,7 @@ func_ov18_0215fb74: ; 0x0215fb74 add r0, sp, #0x44 add r1, sp, #0x20 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov ip, #0 bic r0, ip, #0x1f orr r0, r0, #7 @@ -6370,7 +6370,7 @@ func_ov18_0216065c: ; 0x0216065c ldr r3, [r11, #0x20] mov r2, r0 str r3, [sp, #0x58] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r11, #0x30] cmp r0, #0 beq _02160774 @@ -7261,7 +7261,7 @@ _021611bc: str r4, [sp, #0x2c] str r4, [sp, #0x30] str r3, [sp, #0x34] - bl func_01ff9bc4 + bl Vec3p_Add mov r6, #0x800 mov r4, #0x1000 b _02161214 @@ -7274,7 +7274,7 @@ _021611ec: str r4, [sp, #0x20] str r3, [sp, #0x24] str r3, [sp, #0x28] - bl func_01ff9bc4 + bl Vec3p_Add mov r6, #0x1000 _02161214: add lr, r5, #0x18 @@ -7291,7 +7291,7 @@ _02161214: str r6, [sp, #0x14] str r3, [sp, #0x18] str r4, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r2, _021612d4 ; =0x00001333 add r0, sp, #0x50 str r2, [sp, #0xc] @@ -7299,7 +7299,7 @@ _02161214: mov r2, r0 str r6, [sp, #8] str r4, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #6 @@ -7482,7 +7482,7 @@ _02161484: str r4, [sp, #0x2c] str r4, [sp, #0x30] str r3, [sp, #0x34] - bl func_01ff9bc4 + bl Vec3p_Add mov r6, #0x800 mov r4, #0x1000 b _021614dc @@ -7495,7 +7495,7 @@ _021614b4: str r4, [sp, #0x20] str r3, [sp, #0x24] str r3, [sp, #0x28] - bl func_01ff9bc4 + bl Vec3p_Add mov r6, #0x1000 _021614dc: add lr, r5, #0x18 @@ -7512,7 +7512,7 @@ _021614dc: str r6, [sp, #0x14] str r3, [sp, #0x18] str r4, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r2, _0216159c ; =0x00001333 add r0, sp, #0x50 str r2, [sp, #0xc] @@ -7520,7 +7520,7 @@ _021614dc: mov r2, r0 str r6, [sp, #8] str r4, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #6 @@ -7708,7 +7708,7 @@ _02161760: str r4, [sp, #0x2c] str r4, [sp, #0x30] str r3, [sp, #0x34] - bl func_01ff9bc4 + bl Vec3p_Add mov r6, #0x800 mov r4, #0x1000 b _021617b8 @@ -7721,7 +7721,7 @@ _02161790: str r4, [sp, #0x20] str r3, [sp, #0x24] str r3, [sp, #0x28] - bl func_01ff9bc4 + bl Vec3p_Add mov r6, #0x1000 _021617b8: add lr, r5, #0x18 @@ -7738,7 +7738,7 @@ _021617b8: str r6, [sp, #0x14] str r3, [sp, #0x18] str r4, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r2, _021618a8 ; =0x00001333 add r0, sp, #0x50 str r2, [sp, #0xc] @@ -7746,7 +7746,7 @@ _021617b8: mov r2, r0 str r6, [sp, #8] str r4, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #6 @@ -8038,7 +8038,7 @@ _02161b54: str r4, [sp, #0x2c] str r4, [sp, #0x30] str r3, [sp, #0x34] - bl func_01ff9bc4 + bl Vec3p_Add mov r6, #0x800 mov r4, #0x1000 b _02161bac @@ -8051,7 +8051,7 @@ _02161b84: str r4, [sp, #0x20] str r3, [sp, #0x24] str r3, [sp, #0x28] - bl func_01ff9bc4 + bl Vec3p_Add mov r6, #0x1000 _02161bac: add lr, r5, #0x18 @@ -8068,7 +8068,7 @@ _02161bac: str r6, [sp, #0x14] str r3, [sp, #0x18] str r4, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r2, _02161c6c ; =0x00001333 add r0, sp, #0x50 str r2, [sp, #0xc] @@ -8076,7 +8076,7 @@ _02161bac: mov r2, r0 str r6, [sp, #8] str r4, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #6 @@ -8241,7 +8241,7 @@ _02161dd0: str lr, [sp, #0xc] str ip, [sp, #0x10] str r3, [sp, #0x14] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0x4000 add sp, sp, #0x18 strh r0, [r4, #0xc] @@ -8256,7 +8256,7 @@ _02161e08: str lr, [sp] str ip, [sp, #4] str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 strh r0, [r4, #0xc] add sp, sp, #0x18 @@ -9157,7 +9157,7 @@ _02162a00: ldr r3, [r4, #0x20] mov r2, r0 str r3, [sp, #0x14c] - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 str r1, [sp] ldr r0, _02162ca4 ; =data_027e0fe8 @@ -9827,7 +9827,7 @@ _0216335c: ldr r3, [r8, #0x68] add r0, r10, #0x18 str r3, [sp, #0x24] - bl func_01ff9bc4 + bl Vec3p_Add str r5, [sp] str r5, [sp, #4] str r5, [sp, #8] @@ -9929,7 +9929,7 @@ _021634dc: mov r1, r6 mov r2, r11 str r7, [sp, #0x50] - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 mov r0, #0x11 mov r2, r1 @@ -10018,7 +10018,7 @@ _02163614: str r3, [sp, #8] str ip, [sp, #0xc] str lr, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add str r8, [sp] str r8, [sp, #4] ldr r0, [r6] @@ -10636,7 +10636,7 @@ _02163e68: ldr r3, [r8, #0x68] add r0, r10, #0x18 str r3, [sp, #0x24] - bl func_01ff9bc4 + bl Vec3p_Add str r5, [sp] str r5, [sp, #4] str r5, [sp, #8] @@ -10738,7 +10738,7 @@ _02163fe8: mov r1, r6 mov r2, r11 str r7, [sp, #0x50] - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 mov r0, #0x11 mov r2, r1 @@ -10827,7 +10827,7 @@ _02164120: str r3, [sp, #8] str ip, [sp, #0xc] str lr, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add str r8, [sp] str r8, [sp, #4] ldr r0, [r6] @@ -13850,7 +13850,7 @@ func_ov18_02166700: ; 0x02166700 add r0, r1, #0x400 add r2, sp, #0x18 add r1, r5, #0x4e0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] bl func_01ffa0f4 @@ -13864,7 +13864,7 @@ func_ov18_02166700: ; 0x02166700 mov r1, #0 mov r0, r3 str r1, [sp, #0x10] - bl func_01ff9cec + bl Vec3p_Length mov r1, r0 ldr r0, [sp, #0x1c] bl func_01ffa0f4 @@ -16890,7 +16890,7 @@ _021690f4: ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0x14] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02169154 ; =data_027e0e58 add r2, sp, #0xc ldr r0, [r0] @@ -16949,7 +16949,7 @@ _021691bc: ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0xc] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0216922c ; =data_027e0e58 add r2, sp, #4 ldr r0, [r0] diff --git a/asm/ov19.inc b/asm/ov19.inc index 48ba9dcd..5611e3bb 100644 --- a/asm/ov19.inc +++ b/asm/ov19.inc @@ -147,10 +147,10 @@ .extern func_01ff8690 .extern func_01ff9158 .extern func_01ff9958 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ffa0f4 .extern func_01ffa9fc .extern func_01fffbec @@ -177,7 +177,7 @@ .extern func_020370d0 .extern func_0203eba8 .extern func_0203ebc8 -.extern func_02042f74 +.extern abs .extern func_0204f614 .extern func_0204f754 .extern func_ov00_02079e68 diff --git a/asm/ov19.s b/asm/ov19.s index 3399d82a..c57e32f6 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -346,7 +346,7 @@ func_ov19_0216dac8: ; 0x0216dac8 str r7, [sp, #0x18] str r6, [sp, #0x1c] str r3, [sp, #0x20] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0xc mov r3, r6 ldr r1, _0216dd98 ; =0x00000266 @@ -480,7 +480,7 @@ _0216dc18: add r2, r5, #0x60 str r3, [sp] str r6, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r5, #0x60 mov r2, r0 mov r1, #0x1000 @@ -526,7 +526,7 @@ func_ov19_0216ddac: ; 0x0216ddac ldr r1, [r1] ldr r0, [r0, #0x640] sub r0, r1, r0 - bl func_02042f74 + bl abs add r1, r4, #0x1000 ldr r2, _0216de00 ; =gPlayerPos ldr r1, [r1, #0x648] @@ -534,7 +534,7 @@ func_ov19_0216ddac: ; 0x0216ddac mov r4, r0 sub r2, r2, #0x4000 sub r0, r2, r1 - bl func_02042f74 + bl abs cmp r4, #0x1000 cmplt r0, #0x1000 movlt r0, #1 @@ -638,7 +638,7 @@ func_ov19_0216df14: ; 0x0216df14 ldr r0, _0216df8c ; =gPlayerPos add r1, r4, #0x48 add r2, r4, #0x60 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r4, #0x60] ldr r1, [r4, #0x68] bl func_01ffa0f4 @@ -733,7 +733,7 @@ func_ov19_0216e020: ; 0x0216e020 str r3, [r2, #0x668] add r1, r1, #0x1000 str ip, [r2, #0x664] - bl func_01ff9d4c + bl Vec3p_Normalize ldmia sp!, {r3, pc} arm_func_end func_ov19_0216e020 @@ -747,7 +747,7 @@ func_ov19_0216e060: ; 0x0216e060 add r1, r0, #0x1000 mov r3, r2 mov r0, #0x66 - bl func_01ff9e64 + bl Vec3p_Axpy add r0, r4, #0x60 ldr r1, _0216e0f8 ; =0x000004cd mov r2, r0 @@ -1132,7 +1132,7 @@ _0216e46c: sub r6, r7, #0x2000 add r3, r3, r6 str r3, [sp, #0x34] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [sp, #0x3c] ldr r0, [sp, #0x38] @@ -1605,7 +1605,7 @@ _0216eb88: add r2, sp, #0 add r0, r4, #0x48 add r1, r4, #0x14 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -1629,7 +1629,7 @@ _0216eb88: mov r0, #0x2000 str lr, [sp, #4] str ip, [sp, #8] - bl func_01ff9e64 + bl Vec3p_Axpy add r0, r4, #0x21c mov r1, #6 mov r2, #0 @@ -4783,7 +4783,7 @@ func_ov19_02171528: ; 0x02171528 add r1, sp, #0x48 add r2, sp, #0x54 mov r0, r5 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x1c] ldr r3, _021715f0 ; =data_02050f54 ldrh r1, [r0, #0x78] @@ -5259,7 +5259,7 @@ _02171b98: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r5, #0x300] add r0, r0, #0x9a add r0, r0, #0x100 @@ -5380,7 +5380,7 @@ _02171d3c: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r5, #0x138] cmp r0, #0x96 blt _02171db0 @@ -6481,7 +6481,7 @@ func_ov19_02172b20: ; 0x02172b20 add r0, sp, #0x24 add r1, sp, #0x18 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub mov ip, #0 add r0, sp, #0x24 sub r3, ip, #0x8000 @@ -6490,14 +6490,14 @@ func_ov19_02172b20: ; 0x02172b20 str ip, [sp, #0xc] str ip, [sp, #0x10] str r3, [sp, #0x14] - bl func_01ff9bc4 + bl Vec3p_Add b _02172bf4 _02172bb8: bl func_01fffbec add r0, sp, #0x24 add r1, sp, #0x18 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x24 mov lr, #0x4800 mov ip, #0x3000 @@ -6507,7 +6507,7 @@ _02172bb8: str lr, [sp] str ip, [sp, #4] str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add _02172bf4: add r2, r4, #0x178 add r1, r4, #0x180 @@ -7740,7 +7740,7 @@ func_ov19_02173c04: ; 0x02173c04 str ip, [sp, #0x2c] str r3, [sp, #0x30] str ip, [sp, #0x34] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _02173cec ; =0x0000099a ldr r0, _02173cf0 ; =0x00001333 str r1, [sp, #0x20] @@ -7749,7 +7749,7 @@ func_ov19_02173c04: ; 0x02173c04 str r1, [sp, #0x28] add r1, sp, #0x20 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f ldrh r1, [r4, #0x24] @@ -8459,7 +8459,7 @@ func_ov19_02174554: ; 0x02174554 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 bl func_ov00_020cc3fc mov r0, r4 diff --git a/asm/ov20.inc b/asm/ov20.inc index 9782493b..5f55413b 100644 --- a/asm/ov20.inc +++ b/asm/ov20.inc @@ -134,11 +134,11 @@ .extern func_01ff8248 .extern func_01ff8aa0 .extern func_01ff9158 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9cec -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Length +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffbe78 diff --git a/asm/ov20.s b/asm/ov20.s index 1ce141b6..f7887939 100644 --- a/asm/ov20.s +++ b/asm/ov20.s @@ -223,7 +223,7 @@ _0216d968: mov r3, r9 add r2, r10, #0x48 str r5, [sp, #0x10] - bl func_01ff9e64 + bl Vec3p_Axpy add r0, r7, #1 mov r1, r0, lsl #0x10 add r0, r8, #0xff @@ -533,7 +533,7 @@ _0216ddc4: mov r0, r6 add r1, r1, #0x48 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy add r4, r4, #1 cmp r4, #3 blt _0216ddc4 @@ -759,7 +759,7 @@ _0216e120: add r2, sp, #0x5c mov r0, r3 add r1, r7, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x5c] ldr r1, [sp, #0x64] bl func_01ffa0f4 @@ -828,7 +828,7 @@ _0216e120: mla r4, r6, r0, r4 mla r4, r0, r5, r4 add r0, r4, #0x3000 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [r7, #0xa8c] ldr r0, _0216e550 ; =gMapManager str r1, [sp, #0x20] @@ -2211,7 +2211,7 @@ func_ov20_0216f5b0: ; 0x0216f5b0 add r0, r9, #0x60 ldrsh r6, [r2, r3] ldrsh r7, [r2, r1] - bl func_01ff9cec + bl Vec3p_Length mov r4, r0 add r0, r9, #0x48 mov r1, r8 @@ -2387,7 +2387,7 @@ func_ov20_0216f82c: ; 0x0216f82c add r0, r4, r0, lsl #2 ldr r0, [r0, #0xa40] add r0, r0, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -3398,7 +3398,7 @@ func_ov20_02170480: ; 0x02170480 add r0, r4, #0x330 add r1, r4, #0x48 add r2, r4, #0x60 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 str r1, [r4, #0x64] ldr r3, [r4, #0x60] @@ -3574,7 +3574,7 @@ _021706a0: str r5, [sp] str lr, [sp, #4] str ip, [sp, #8] - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [sp, #0xc] mov r0, r4 str r1, [r4, #0x360] @@ -3609,7 +3609,7 @@ func_ov20_02170740: ; 0x02170740 add r2, sp, #0 mov r0, r5 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -3633,7 +3633,7 @@ func_ov20_02170740: ; 0x02170740 mov r0, #0x29 add r1, sp, #0 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, #0 str r0, [r4, #0x64] add r0, r4, #0x60 @@ -4916,7 +4916,7 @@ _021718dc: mov r0, r3 add r1, r5, #0x48 add r2, r5, #0x60 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 str r1, [r5, #0x64] ldr r0, [r5, #0x60] @@ -4931,7 +4931,7 @@ _021718dc: _02171928: add r0, r5, #0x60 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r2, [r5, #0x60] ldr r0, _021719d8 ; =0x00000333 mov r1, #0 @@ -5007,7 +5007,7 @@ _02171a30: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [sp] ldr r3, [r5, #8] @@ -5603,7 +5603,7 @@ _02172258: add r6, r2, #0xe00 mov r2, r0 strh r6, [r3, #0x88] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 mov r1, #0 bl func_01fffd04 @@ -5754,7 +5754,7 @@ _02172494: add r2, r2, #0xe00 strh r2, [r3, #0x88] mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r5, #0x4c] cmp r0, #0xa000 ble _021724cc @@ -6379,7 +6379,7 @@ func_ov20_02172c58: ; 0x02172c58 str ip, [sp, #0x28] str r3, [sp, #0x2c] str r3, [sp, #0x30] - bl func_01ff9bc4 + bl Vec3p_Add b _02172cd8 _02172cbc: add r0, r4, #0x18 @@ -6388,7 +6388,7 @@ _02172cbc: str r3, [sp, #0x1c] str r3, [sp, #0x20] str r3, [sp, #0x24] - bl func_01ff9bc4 + bl Vec3p_Add _02172cd8: ldr r0, [r4, #0x18] mov r1, #0 @@ -8683,7 +8683,7 @@ _02174a20: ldr r1, _02174ba4 ; =gPlayerPos add r2, sp, #0x34 add r0, r6, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r1, sp, #0x40 mov r0, r6 bl _ZN5Actor18CollidesWithShieldEP8Cylinder @@ -8733,7 +8733,7 @@ _02174b4c: ldr r0, _02174ba4 ; =gPlayerPos add r2, sp, #0x10 add r1, r6, #0x54 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [sp, #0x14] mov r0, #1 @@ -11857,7 +11857,7 @@ func_ov20_02177238: ; 0x02177238 add r0, sp, #0x40 add r1, sp, #0x34 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #4 str r0, [sp] ldr r0, _021772f4 ; =data_027e0e58 @@ -12058,7 +12058,7 @@ _02177538: mov r0, r5 mov r1, r6 mov r2, r5 - bl func_01ff9bc4 + bl Vec3p_Add cmp r8, #0 ldr r0, [r4] mov r2, #0 diff --git a/asm/ov21.inc b/asm/ov21.inc index a16a6fe4..20022bdd 100644 --- a/asm/ov21.inc +++ b/asm/ov21.inc @@ -95,9 +95,9 @@ .extern data_ov00_020eed2c .extern func_01ff8aa0 .extern func_01ff9158 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c2c +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Dot .extern func_01ffa0f4 .extern func_01ffbe78 .extern func_01ffbf5c diff --git a/asm/ov21.s b/asm/ov21.s index 692f483c..39c4305b 100644 --- a/asm/ov21.s +++ b/asm/ov21.s @@ -315,11 +315,11 @@ func_ov21_0216d950: ; 0x0216d950 add r0, sp, #0x6c add r1, sp, #0 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x6c add r1, sp, #0xc add r2, sp, #0x54 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp] ldr r1, [sp, #0xc] rsb r0, r0, #0 @@ -329,11 +329,11 @@ func_ov21_0216d950: ; 0x0216d950 add r1, sp, #0 mov r2, r0 str r3, [sp, #0xc] - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x60 add r1, sp, #0xc add r2, sp, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x9c] cmp r0, #0 beq _0216daa8 @@ -498,10 +498,10 @@ func_ov21_0216dc58: ; 0x0216dc58 mov r2, r0 add r1, ip, #0x14 str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0x24000 movlt r0, #1 movge r0, #0 @@ -694,7 +694,7 @@ func_ov21_0216df08: ; 0x0216df08 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 bl func_ov00_020cc3fc ldmia sp!, {r4, pc} @@ -2659,13 +2659,13 @@ func_ov21_0216f6a8: ; 0x0216f6a8 add r1, r4, #0x54 bne _0216f708 add r2, r4, #0x60 - bl func_01ff9bf8 + bl Vec3p_Sub add sp, sp, #0x18 mov r0, #1 ldmia sp!, {r4, pc} _0216f708: add r2, r4, #0x60 - bl func_01ff9bf8 + bl Vec3p_Sub mvn r1, #0 add r3, sp, #4 mov r0, r4 @@ -2744,7 +2744,7 @@ func_ov21_0216f7c8: ; 0x0216f7c8 add r0, r10, #0x48 add r1, r10, #0x54 add r2, r10, #0x60 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r10, #0x138] cmp r0, #0x1e addlt sp, sp, #0x118 @@ -2892,7 +2892,7 @@ _0216fa3c: mov r0, r7 mov r1, r9 mov r2, r7 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4] add r0, sp, #0x14 mov r2, r7 diff --git a/asm/ov22.inc b/asm/ov22.inc index 3f62a2a3..dedf31fc 100644 --- a/asm/ov22.inc +++ b/asm/ov22.inc @@ -141,12 +141,12 @@ .extern func_01ff8aa0 .extern func_01ff8e84 .extern func_01ff9158 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c2c -.extern func_01ff9cec -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Dot +.extern Vec3p_Length +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffbe78 diff --git a/asm/ov22.s b/asm/ov22.s index 52095645..596292ee 100644 --- a/asm/ov22.s +++ b/asm/ov22.s @@ -534,7 +534,7 @@ _0216dd40: add r0, sp, #0x3c add r1, sp, #0x30 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub mov ip, #0 add r0, sp, #0x3c sub r3, ip, #0x8000 @@ -543,7 +543,7 @@ _0216dd40: str ip, [sp, #0x24] str ip, [sp, #0x28] str r3, [sp, #0x2c] - bl func_01ff9bc4 + bl Vec3p_Add b _0216de58 _0216dd84: add r0, sp, #0x30 @@ -552,7 +552,7 @@ _0216dd84: add r0, sp, #0x3c add r1, sp, #0x30 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub mov ip, #0 add r0, sp, #0x3c mov r3, #0x8000 @@ -561,7 +561,7 @@ _0216dd84: str ip, [sp, #0x18] str ip, [sp, #0x1c] str r3, [sp, #0x20] - bl func_01ff9bc4 + bl Vec3p_Add b _0216de58 _0216ddc8: add r0, sp, #0x30 @@ -570,7 +570,7 @@ _0216ddc8: add r0, sp, #0x3c add r1, sp, #0x30 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x3c mov lr, #0x4800 rsb lr, lr, #0 @@ -581,7 +581,7 @@ _0216ddc8: str lr, [sp, #0xc] str ip, [sp, #0x10] str r3, [sp, #0x14] - bl func_01ff9bc4 + bl Vec3p_Add b _0216de58 _0216de14: add r0, sp, #0x30 @@ -590,7 +590,7 @@ _0216de14: add r0, sp, #0x3c add r1, sp, #0x30 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x3c mov lr, #0x4800 mov ip, #0x3000 @@ -600,7 +600,7 @@ _0216de14: str lr, [sp] str ip, [sp, #4] str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add _0216de58: add r2, r4, #0x174 add r1, r4, #0x180 @@ -962,7 +962,7 @@ func_ov22_0216e2a8: ; 0x0216e2a8 str r4, [sp, #0x18] str r3, [sp, #0x1c] str r4, [sp, #0x20] - bl func_01ff9bf8 + bl Vec3p_Sub mov r2, r4 ldr r1, _0216e580 ; =0x00001334 add r0, sp, #0x50 @@ -971,7 +971,7 @@ func_ov22_0216e2a8: ; 0x0216e2a8 str r2, [sp, #0x14] add r1, sp, #0xc mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f mov r1, r5 @@ -1938,7 +1938,7 @@ _0216f050: str r8, [sp, #0x14] str r7, [sp, #0x18] str r3, [sp, #0x1c] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [r4, #0x60] str r0, [r4, #0x64] @@ -2797,7 +2797,7 @@ _0216fb20: ldrsh r3, [r6, r3] rsb r3, r3, #0 str r3, [sp, #0x58] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0x5c] str r0, [r5, #0x48] ldr r0, [sp, #0x60] @@ -2833,7 +2833,7 @@ _0216fbc4: ldr r3, [r5, #0x1c] mov r2, r0 str r3, [sp, #0x1c] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r5, #0x14] add r0, sp, #0x38 str r1, [sp, #8] @@ -2843,7 +2843,7 @@ _0216fbc4: ldr r3, [r5, #0x1c] mov r2, r0 str r3, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add mov ip, #0 bic r0, ip, #0x1f orr r0, r0, #2 @@ -3622,11 +3622,11 @@ func_ov22_02170628: ; 0x02170628 add r2, sp, #0x20 mov r0, r3 mov r1, lr - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0x20 str r1, [sp, #0x24] - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x3000 bge _02170704 add r0, sp, #8 @@ -3649,7 +3649,7 @@ func_ov22_02170628: ; 0x02170628 ldrsh r2, [r3, r2] rsb r2, r2, #0 str r2, [sp, #0x10] - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0x1000 movgt r0, #0x1000 bgt _021706ec @@ -3661,7 +3661,7 @@ _021706ec: add r1, sp, #8 add r2, sp, #0x38 add r3, sp, #0x14 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r5, _02170814 ; =0x0000019a b _02170720 _02170704: @@ -3780,7 +3780,7 @@ func_ov22_02170854: ; 0x02170854 add r2, sp, #0x18 mov r0, r3 mov r1, lr - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0xc str r1, [sp, #0x1c] @@ -3802,14 +3802,14 @@ func_ov22_02170854: ; 0x02170854 ldrsh r2, [r3, r2] rsb r2, r2, #0 str r2, [sp, #0x14] - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 mov r0, #0x1000 rsbgt r0, r0, #0 add r1, sp, #0xc add r2, sp, #0x30 add r3, sp, #0 - bl func_01ff9e64 + bl Vec3p_Axpy add r0, r4, #0x88 add r2, sp, #0 add r0, r0, #0x400 @@ -3936,7 +3936,7 @@ func_ov22_021709e0: ; 0x021709e0 add r0, sp, #0x10 add r1, sp, #0x1c add r2, sp, #4 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #4] mov r2, #1 str r0, [r5, #0x270] @@ -4970,11 +4970,11 @@ _021717d8: str r5, [sp, #0xc] str lr, [sp, #0x10] str ip, [sp, #0x14] - bl func_01ff9e64 + bl Vec3p_Axpy add r0, sp, #0xc add r1, r4, #0x48 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub mov r2, #0 str r2, [sp, #0x10] add r0, r4, #0x740 @@ -4986,7 +4986,7 @@ _021717d8: mov r2, r0 bl func_0202da8c add r0, sp, #0xc - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x52 bge _021718c0 add r0, r4, #0x21c @@ -5084,7 +5084,7 @@ func_ov22_021719c4: ; 0x021719c4 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 bl func_ov00_020cc45c ldmia sp!, {r4, pc} @@ -5682,7 +5682,7 @@ func_ov22_02172150: ; 0x02172150 add r0, r0, #0x400 add r1, r4, #0x48 str r3, [r4, #0x6c] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [r4, #0x60] str r0, [r4, #0x68] @@ -5976,7 +5976,7 @@ _02172564: ldr r0, [r5, #0x210] add r1, r5, #0x1f8 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy mov r4, #1 _0217259c: mov r0, r5 @@ -6058,7 +6058,7 @@ func_ov22_0217260c: ; 0x0217260c ldr r0, [r4, #0x210] add r1, r4, #0x1f8 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy mov r6, #1 _021726b0: mov r0, r4 @@ -7153,7 +7153,7 @@ _02173484: add r0, sp, #0x14 add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -7937,7 +7937,7 @@ _02173f14: add r0, r1, #0x54 add r2, sp, #0 add r1, r1, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, [sp] ldr r1, [sp, #4] ldr r0, [sp, #8] @@ -8342,7 +8342,7 @@ _021744c8: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r5, #0x130] cmp r0, #3 beq _02174514 @@ -8453,7 +8453,7 @@ func_ov22_0217463c: ; 0x0217463c add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 bl func_ov00_020cc3fc mov r0, r4 @@ -9877,7 +9877,7 @@ func_ov22_021757c0: ; 0x021757c0 str r3, [sp, #0x14] ldr r3, [r5, #0x298] str r3, [sp, #0x18] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _0217590c ; =gMapManager add r0, sp, #0 ldr r5, [r1] @@ -10791,7 +10791,7 @@ func_ov22_02176338: ; 0x02176338 add r1, sp, #0x24 mov r0, ip mov r2, ip - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0x1000 ldr r2, _02176408 ; =0x0000059a str r1, [sp, #0x18] @@ -10801,7 +10801,7 @@ func_ov22_02176338: ; 0x02176338 str r2, [sp, #0x20] add r1, sp, #0x18 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x3c add lr, sp, #0 ldmia r0, {r0, r1, r2} @@ -11085,7 +11085,7 @@ func_ov22_021766dc: ; 0x021766dc str ip, [sp, #0xc] str r3, [sp, #0x10] str r3, [sp, #0x14] - bl func_01ff9bc4 + bl Vec3p_Add mov r3, #0 add r0, sp, #0x6c mov ip, #0x1000 @@ -11094,7 +11094,7 @@ func_ov22_021766dc: ; 0x021766dc str ip, [sp] str r3, [sp, #4] str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add ldrb r0, [r4, #0x82] cmp r0, #0 ldr r0, [r4, #0x68] @@ -11143,14 +11143,14 @@ _021767ac: add r0, sp, #0x78 add r1, sp, #0x18 add r2, sp, #0x60 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #0x18] add r0, sp, #0x6c rsb r3, r1, #0 add r1, sp, #0x18 add r2, sp, #0x54 str r3, [sp, #0x18] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x9c] cmp r0, #0 beq _0217684c @@ -11193,10 +11193,10 @@ func_ov22_0217687c: ; 0x0217687c add r0, sp, #0x20 add r1, sp, #0x2c add r2, sp, #0x14 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x14 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize mov r0, #0x1000 ldr r2, [sp, #0x30] rsb r0, r0, #0 @@ -11219,16 +11219,16 @@ func_ov22_0217687c: ; 0x0217687c mov r0, r7 add r1, sp, #0x14 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy add r2, sp, #0x2c mov r0, r6 add r1, sp, #0x14 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy add r0, sp, #0x20 add r1, sp, #0x2c add r2, sp, #0x14 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r2, [sp, #0x2c] ldr r1, [sp, #0x30] str r2, [sp, #4] @@ -11258,7 +11258,7 @@ func_ov22_0217687c: ; 0x0217687c mov r3, r4 str r0, [r4, #8] ldr r0, [sp] - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, #1 add sp, sp, #0x38 ldmia sp!, {r3, r4, r5, r6, r7, pc} @@ -12198,10 +12198,10 @@ _02177548: add r0, sp, #0x48 add r2, sp, #0x10 add r1, r4, #0x29c - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x10 mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0x2400 bge _02177684 add r0, sp, #0x10 @@ -12220,7 +12220,7 @@ _02177668: add r1, sp, #0x10 add r2, sp, #0x48 add r0, r4, #0x29c - bl func_01ff9bc4 + bl Vec3p_Add _02177684: mov r1, #0 str r1, [sp] @@ -13222,7 +13222,7 @@ func_ov22_0217822c: ; 0x0217822c add r1, sp, #0x24 add r2, sp, #0x30 mov r0, r5 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x1c] ldr r3, _021782d4 ; =data_02050f54 ldrh r1, [r0, #0x78] diff --git a/asm/ov23.inc b/asm/ov23.inc index 5005878b..7d816ea9 100644 --- a/asm/ov23.inc +++ b/asm/ov23.inc @@ -187,12 +187,12 @@ .extern func_01ff9158 .extern func_01ff991c .extern func_01ff9b88 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c2c -.extern func_01ff9cec -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Dot +.extern Vec3p_Length +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffbe34 diff --git a/asm/ov23.s b/asm/ov23.s index 6a399f77..21cd1359 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -345,7 +345,7 @@ _0216da90: ldrsh r3, [r8, r3] rsb r3, r3, #0 str r3, [sp, #0x58] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0x5c] str r0, [r4, #0x48] ldr r0, [sp, #0x60] @@ -381,7 +381,7 @@ _0216db3c: ldr r3, [r4, #0x1c] mov r2, r0 str r3, [sp, #0x1c] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4, #0x14] add r0, sp, #0x38 str r1, [sp, #8] @@ -391,7 +391,7 @@ _0216db3c: ldr r3, [r4, #0x1c] mov r2, r0 str r3, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x44 mov ip, #0 add r5, sp, #0x20 @@ -874,11 +874,11 @@ func_ov23_0216e180: ; 0x0216e180 add r2, sp, #0x20 mov r0, r3 mov r1, lr - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0x20 str r1, [sp, #0x24] - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x3000 bge _0216e25c add r0, sp, #8 @@ -901,7 +901,7 @@ func_ov23_0216e180: ; 0x0216e180 ldrsh r2, [r3, r2] rsb r2, r2, #0 str r2, [sp, #0x10] - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0xc00 movgt r0, #0xc00 bgt _0216e244 @@ -913,7 +913,7 @@ _0216e244: add r1, sp, #8 add r2, sp, #0x38 add r3, sp, #0x14 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r5, _0216e368 ; =0x0000019a b _0216e278 _0216e25c: @@ -1034,7 +1034,7 @@ func_ov23_0216e3b4: ; 0x0216e3b4 add r2, sp, #0x18 mov r0, r3 mov r1, lr - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0xc str r1, [sp, #0x1c] @@ -1056,14 +1056,14 @@ func_ov23_0216e3b4: ; 0x0216e3b4 ldrsh r2, [r3, r2] rsb r2, r2, #0 str r2, [sp, #0x14] - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 mov r0, #0x1000 rsbgt r0, r0, #0 add r1, sp, #0xc add r2, sp, #0x30 add r3, sp, #0 - bl func_01ff9e64 + bl Vec3p_Axpy add r0, r4, #0x88 add r2, sp, #0 add r0, r0, #0x400 @@ -1264,7 +1264,7 @@ func_ov23_0216e65c: ; 0x0216e65c ldrsh r3, [ip, r3] rsb r3, r3, #0 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0xc] str r0, [r5, #0x48] ldr r0, [sp, #0x10] @@ -2948,7 +2948,7 @@ func_ov23_0216fc10: ; 0x0216fc10 add r2, sp, #0x2c add r0, r4, #0x39c add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 ldr r3, _0216fd80 ; =0x66666667 str r1, [sp, #0x30] @@ -3837,13 +3837,13 @@ func_ov23_021707e0: ; 0x021707e0 bicne r0, r0, #2 strne r0, [r1, #0x24] add r0, sp, #0xc - bl func_01ff9cec + bl Vec3p_Length ldr r1, _0217099c ; =0x0000059a cmp r0, r1 blt _02170980 add r1, sp, #0 mov r0, r4 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r9, [sp] mov r1, #0x2800 umull r0, r10, r9, r1 @@ -3879,7 +3879,7 @@ func_ov23_021707e0: ; 0x021707e0 str r7, [sp, #4] add r1, r5, #0x190 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r5, #0x1bc] cmp r0, #0 beq _0217093c @@ -3904,7 +3904,7 @@ func_ov23_021707e0: ; 0x021707e0 _0217093c: add r0, sp, #0xc mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r2, [sp, #0xc] ldr r1, [sp, #0x10] rsb r4, r2, #0 @@ -4595,7 +4595,7 @@ func_ov23_0217118c: ; 0x0217118c mov r0, r2 add r1, r6, #0x1c add r2, r6, #0x190 - bl func_01ff9bc4 + bl Vec3p_Add ldrsh r2, [sp, #0x10] add r1, r6, #0x100 mov r0, r6 @@ -4803,7 +4803,7 @@ func_ov23_02171410: ; 0x02171410 mov r0, r6 bl _ZN5Actor9GetHitboxEP8Cylinder mov r0, r5 - bl func_01ff9cec + bl Vec3p_Length mov r4, r0 mov r0, r7 bl _ZN13LinkStateBase18func_ov00_020a8b80Ev @@ -4836,7 +4836,7 @@ func_ov23_02171410: ; 0x02171410 str r1, [sp, #0x10] ldr r1, [r5, #8] str r1, [sp, #0x14] - bl func_01ff9cec + bl Vec3p_Length mov r4, r0 add r0, sp, #0xc bl func_01fffb4c @@ -4903,7 +4903,7 @@ _02171594: str r1, [sp, #4] ldr r1, [r5, #8] str r1, [sp, #8] - bl func_01ff9cec + bl Vec3p_Length mov r4, r0 add r0, sp, #0 bl func_01fffb4c @@ -4976,7 +4976,7 @@ func_ov23_021716b0: ; 0x021716b0 addne sp, sp, #0xc ldmneia sp!, {r3, r4, r5, r6, pc} mov r0, r4 - bl func_01ff9cec + bl Vec3p_Length mov r6, r0 mov r0, r5 bl _ZN13LinkStateBase18func_ov00_020a8b80Ev @@ -5003,7 +5003,7 @@ func_ov23_021716b0: ; 0x021716b0 str r1, [sp, #4] ldr r1, [r4, #8] str r1, [sp, #8] - bl func_01ff9cec + bl Vec3p_Length mov r6, r0 add r0, sp, #0 bl func_01fffb4c @@ -5119,7 +5119,7 @@ func_ov23_0217181c: ; 0x0217181c str r0, [r1, #0x30] _021718ec: add r0, sp, #0x40 - bl func_01ff9cec + bl Vec3p_Length mov r1, r0, lsl #0x7 ldr r2, _02172078 ; =0x5b672f7d mov r0, r1, lsr #0x1f @@ -5155,7 +5155,7 @@ _0217194c: beq _021719b0 _0217196c: add r0, sp, #0x40 - bl func_01ff9cec + bl Vec3p_Length mov r5, r0 mov r0, r4 bl _ZN13LinkStateBase15GetPlayer_Unk18Ev @@ -5190,7 +5190,7 @@ _021719b0: mov r1, r0 add r0, sp, #0x28 add r2, sp, #0x1c - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x1c] ldr r1, [sp, #0x24] mov r5, #0x1000 @@ -5277,7 +5277,7 @@ _02171b10: bl _ZN13LinkStateBase20GetPlayerControlDataEv str r8, [r0, #0x20] add r0, sp, #0x34 - bl func_01ff9cec + bl Vec3p_Length ldr r1, _02172098 ; =0x00000333 cmp r0, r1 bge _02171b9c @@ -5352,9 +5352,9 @@ _02171bd8: str ip, [sp, #0x14] str r3, [sp, #0x10] str r8, [sp, #0x18] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x10 - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x800 movle r8, #1 movgt r8, #0 @@ -5371,7 +5371,7 @@ _02171c78: ldr r1, _021720a8 ; =0x000002e1 str r1, [r0] add r0, sp, #0x40 - bl func_01ff9cec + bl Vec3p_Length ldr r1, _02172084 ; =data_ov23_0217a2c4 ldr r1, [r1, #4] mul r1, r0, r1 @@ -5400,7 +5400,7 @@ _02171ccc: b _02171d34 _02171d10: add r0, sp, #0x40 - bl func_01ff9cec + bl Vec3p_Length ldr r1, _02172084 ; =data_ov23_0217a2c4 ldr r1, [r1, #4] mul r1, r0, r1 @@ -5508,7 +5508,7 @@ _02171e18: add r0, sp, #0x40 str r1, [sp, #0xc] add r1, sp, #4 - bl func_01ff9c2c + bl Vec3p_Dot ldr r2, [sp, #4] ldr r1, [sp, #0xc] smull r7, r3, r2, r0 @@ -9033,7 +9033,7 @@ func_ov23_02174de0: ; 0x02174de0 str r4, [sp, #0x30] str lr, [sp, #0x34] str ip, [sp, #0x38] - bl func_01ff9e64 + bl Vec3p_Axpy add sp, sp, #0x3c ldmia sp!, {r4, r5, pc} arm_func_end func_ov23_02174de0 @@ -9944,7 +9944,7 @@ func_ov23_02175978: ; 0x02175978 str r3, [sp, #8] ldr r3, [r6, #0x50] str r3, [sp, #0xc] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 ldr r3, [r0] mov r1, r5 @@ -10017,7 +10017,7 @@ func_ov23_02175b04: ; 0x02175b04 add r0, r4, #0x48 add r1, r4, #0x15c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldmia sp!, {r4, pc} .align 2, 0 _02175b3c: .word data_027e0ff4 @@ -10213,7 +10213,7 @@ func_ov23_02175d3c: ; 0x02175d3c str r6, [sp, #0x3c] str r5, [sp, #0x40] str r3, [sp, #0x44] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02175efc ; =data_ov23_0217966c add r3, sp, #0x60 ldmia r0, {r0, r1, r2} @@ -10264,7 +10264,7 @@ func_ov23_02175d3c: ; 0x02175d3c str r6, [sp, #0x30] str r5, [sp, #0x34] str r3, [sp, #0x38] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r6 str r0, [sp, #0x24] mov r0, #0x1000 @@ -10274,7 +10274,7 @@ func_ov23_02175d3c: ; 0x02175d3c str r1, [sp, #0x2c] add r1, sp, #0x24 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov ip, r5 bic r0, ip, #0x1f orr r0, r0, #7 @@ -10866,7 +10866,7 @@ func_ov23_021765c4: ; 0x021765c4 add r0, r4, #0x18 add r1, sp, #0x68 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldrsh r0, [r4, #0xc] bl func_0202bbbc cmp r0, #3 @@ -10903,7 +10903,7 @@ _02176624: str ip, [sp, #0x44] str r5, [sp, #0x48] str r3, [sp, #0x4c] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x50 ldr ip, _021767ac ; =0x0000059a mov r5, #0x3000 @@ -10913,7 +10913,7 @@ _02176624: str ip, [sp, #0x38] str r5, [sp, #0x3c] str r3, [sp, #0x40] - bl func_01ff9bc4 + bl Vec3p_Add b _02176744 _021766b8: ldr r1, [r4, #0x18] @@ -10940,7 +10940,7 @@ _021766b8: str lr, [sp, #0x2c] str ip, [sp, #0x30] str r3, [sp, #0x34] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x50 ldr r3, _021767ac ; =0x0000059a mov lr, #0x1000 @@ -10950,7 +10950,7 @@ _021766b8: str lr, [sp, #0x20] str ip, [sp, #0x24] str r3, [sp, #0x28] - bl func_01ff9bc4 + bl Vec3p_Add _02176744: add r0, sp, #0x5c add r3, sp, #8 @@ -11332,7 +11332,7 @@ func_ov23_02176bc0: ; 0x02176bc0 add r0, sp, #0xc add r1, sp, #0 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x78 ldr r3, [r0] add r1, sp, #0x18 @@ -12639,7 +12639,7 @@ _02177c5c: str r3, [sp, #0x1c] ldr r3, [lr, #0x50] str r3, [sp, #0x20] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02177e20 ; =data_027e0fd4 mov lr, #0 ldr r0, [r0] @@ -13741,7 +13741,7 @@ _02178b10: ldr r3, [r0, #8] mov r0, r4 str r3, [sp, #0x34] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02179014 ; =gMapManager mov r2, r4 ldr r9, [r0] @@ -13765,7 +13765,7 @@ _02178b10: add r0, sp, #0x44 mov r1, r5 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add _02178c2c: add r8, r8, #0x4000 add r7, r7, #1 diff --git a/asm/ov24.inc b/asm/ov24.inc index 9a76d861..572b54d3 100644 --- a/asm/ov24.inc +++ b/asm/ov24.inc @@ -133,11 +133,11 @@ .extern func_01ff8aa0 .extern func_01ff8e84 .extern func_01ff9158 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c2c -.extern func_01ff9cec -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Dot +.extern Vec3p_Length +.extern Vec3p_Axpy .extern func_01ffa0f4 .extern func_01ffb7ec .extern func_01ffbf5c diff --git a/asm/ov24.s b/asm/ov24.s index dd001eb4..cb21d94a 100644 --- a/asm/ov24.s +++ b/asm/ov24.s @@ -209,7 +209,7 @@ _0216d914: add r1, sp, #0x18 str r3, [sp, #0x18] mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r5, #0x18] ldr r8, [r5, #0x1c] ldr r3, [r5, #0x20] @@ -3182,7 +3182,7 @@ func_ov24_0216ffb8: ; 0x0216ffb8 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 bl func_ov00_020cc3fc ldmia sp!, {r4, pc} @@ -4018,7 +4018,7 @@ _02170a80: str r5, [sp, #0xc] str r5, [sp, #0x10] str r3, [sp, #0x14] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #4] cmp r0, #0 rsblt r0, r0, #0 @@ -4067,7 +4067,7 @@ _02170b24: bl func_ov00_020a61ac add r0, sp, #0 add r1, sp, #0xc - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 addlt sp, sp, #0x18 ldmltia sp!, {r4, r5, r6, r7, r8, pc} @@ -7712,7 +7712,7 @@ func_ov24_02173b18: ; 0x02173b18 ldr r3, [r4, #0x158] add r1, r4, #0x48 ldrsh r5, [r3, #0x6a] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x24] ldr r1, [sp, #0x2c] bl func_01ffa0f4 @@ -8190,7 +8190,7 @@ func_ov24_0217411c: ; 0x0217411c str r5, [sp, #0xc] str lr, [sp, #0x10] str ip, [sp, #0x14] - bl func_01ff9e64 + bl Vec3p_Axpy add r0, r4, #0x2c4 add r2, sp, #0 mov r1, r4 @@ -11305,7 +11305,7 @@ func_ov24_02176a34: ; 0x02176a34 add r1, ip, #0x60 mov r2, r0 str r3, [ip, #0x68] - bl func_01ff9bc4 + bl Vec3p_Add ldmia sp!, {r3, pc} arm_func_end func_ov24_02176a34 @@ -11349,7 +11349,7 @@ func_ov24_02176a94: ; 0x02176a94 add r0, r9, #0x60 ldrsh r6, [r2, r3] ldrsh r7, [r2, r1] - bl func_01ff9cec + bl Vec3p_Length mov r4, r0 mov r1, r8 add r0, r9, #0x48 @@ -11416,7 +11416,7 @@ _02176bc0: add r0, r9, #0x48 add r1, r9, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc} .align 2, 0 _02176bd4: .word data_02050f54 @@ -12199,7 +12199,7 @@ func_ov24_021775f0: ; 0x021775f0 add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r1, r5, #0x100 ldrsh r3, [r1, #0xb4] mov r2, #0 @@ -12463,7 +12463,7 @@ func_ov24_02177944: ; 0x02177944 str ip, [sp, #0x14] str r3, [sp, #0x18] str ip, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _02177a44 ; =0x00000666 ldr r2, _02177a48 ; =0x00001333 add r0, sp, #0x38 @@ -12472,7 +12472,7 @@ func_ov24_02177944: ; 0x02177944 str r1, [sp, #0x10] add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #7 @@ -13181,7 +13181,7 @@ func_ov24_02178234: ; 0x02178234 mov r2, lr str ip, [sp, #0x18] str r3, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _0217831c ; =0x00001333 mov r2, #0x1000 str r1, [sp, #0xc] @@ -13191,7 +13191,7 @@ func_ov24_02178234: ; 0x02178234 str r2, [sp, #8] add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #7 @@ -13380,11 +13380,11 @@ _0217852c: add r0, sp, #0x50 str r2, [sp, #0x58] mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0x50 str r1, [sp, #0x54] - bl func_01ff9cec + bl Vec3p_Length mov r7, r0 ldr r0, _02178694 ; =data_027e0f64 ldr r0, [r0] @@ -13432,7 +13432,7 @@ _0217852c: add r0, sp, #0x44 str r2, [sp, #0x40] mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0x44] str r0, [r5] ldr r1, [sp, #0x48] @@ -13996,7 +13996,7 @@ func_ov24_02178d20: ; 0x02178d20 str ip, [sp, #0x2c] str r3, [sp, #0x30] str ip, [sp, #0x34] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _02178e08 ; =0x0000099a ldr r0, _02178e0c ; =0x00001333 str r1, [sp, #0x20] @@ -14005,7 +14005,7 @@ func_ov24_02178d20: ; 0x02178d20 str r1, [sp, #0x28] add r1, sp, #0x20 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f ldrh r1, [r4, #0x24] diff --git a/asm/ov25.inc b/asm/ov25.inc index 484108ef..69a3e3d2 100644 --- a/asm/ov25.inc +++ b/asm/ov25.inc @@ -140,12 +140,12 @@ .extern func_01ff9158 .extern func_01ff992c .extern func_01ff9958 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c68 -.extern func_01ff9cec -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Cross +.extern Vec3p_Length +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffe1cc diff --git a/asm/ov25.s b/asm/ov25.s index a28f374f..c7b3f645 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -720,7 +720,7 @@ func_ov25_0216e024: ; 0x0216e024 mov r0, r1 add r2, sp, #0 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -828,7 +828,7 @@ func_ov25_0216e174: ; 0x0216e174 mov r0, r1 add r1, r4, #0x48 add r2, r4, #0x60 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r4, #0x60] ldr r1, [r4, #0x68] bl func_01ffa0f4 @@ -911,12 +911,12 @@ _0216e2a8: add r2, sp, #0 mov r0, r5 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, r4, #0x60 - bl func_01ff9cec + bl Vec3p_Length ldr r1, _0216e378 ; =0x00000fae mov r2, #0 umull ip, r3, r0, r1 @@ -1029,7 +1029,7 @@ func_ov25_0216e430: ; 0x0216e430 mov r0, r5 add r1, r6, #0x48 add r2, r6, #0x60 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r6, #0x60 mov r3, #0 mov r1, r4 @@ -1056,12 +1056,12 @@ func_ov25_0216e490: ; 0x0216e490 add r2, sp, #0 add r1, r4, #0x48 mov r5, r3 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, r4, #0x60 - bl func_01ff9cec + bl Vec3p_Length ldr r1, [sp, #0x20] mov r2, #0 add r1, r0, r1 @@ -3213,7 +3213,7 @@ _021701f4: cmp r0, #0 add r0, r4, #0x60 beq _02170358 - bl func_01ff9cec + bl Vec3p_Length ldr r1, [r6, #0x620] ldr r2, [r6, #0x624] mov r5, r0 @@ -3249,7 +3249,7 @@ _02170278: add r2, sp, #0x1c add r1, r6, #0x48 str r3, [sp, #0x30] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x1c] ldr r1, [sp, #0x24] bl func_01ffa0f4 @@ -3300,7 +3300,7 @@ _021702c8: bl func_ov25_02171e80 b _02170378 _02170358: - bl func_01ff9cec + bl Vec3p_Length mov r2, #0 str r0, [sp, #0x18] add r1, sp, #0x10 @@ -5016,10 +5016,10 @@ func_ov25_02171abc: ; 0x02171abc mov r0, r2 add r2, sp, #0x24 mov r4, r1 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x24 add r1, sp, #0 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r1, [sp] ldr r6, [sp, #8] rsb r2, r1, #0 @@ -5029,11 +5029,11 @@ func_ov25_02171abc: ; 0x02171abc str r6, [sp, #0x18] str r3, [sp, #0x1c] str r2, [sp, #0x20] - bl func_01ff9d4c + bl Vec3p_Normalize add r0, sp, #0 add r1, sp, #0x18 add r2, sp, #0xc - bl func_01ff9c68 + bl Vec3p_Cross ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] str r0, [sp, #0x34] @@ -5278,7 +5278,7 @@ func_ov25_02171e30: ; 0x02171e30 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 mov r1, #0 bl func_01fffd04 @@ -5293,7 +5293,7 @@ func_ov25_02171e58: ; 0x02171e58 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 mov r1, #0 bl func_01fffd04 @@ -5471,7 +5471,7 @@ _0217204c: add r0, r6, #0x48 bl func_ov25_02171c2c add r0, r6, #0x60 - bl func_01ff9cec + bl Vec3p_Length ldr r1, _021721d8 ; =0x0000119a mov r2, #0 umull r4, r3, r0, r1 @@ -5525,7 +5525,7 @@ _0217210c: bl _ZN12ActorManager8GetActorEP8ActorRef mov r4, r0 add r0, r6, #0x60 - bl func_01ff9cec + bl Vec3p_Length ldr r1, _021721d8 ; =0x0000119a mov r2, #0 umull r5, r3, r0, r1 @@ -5541,12 +5541,12 @@ _0217210c: add r1, r6, #0x48 add r2, r6, #0x60 movge r5, #0x400 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [r6, #0x64] add r0, r6, #0x60 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r0, [r6, #0x60] smull r1, r0, r5, r0 adds r1, r1, #0x800 @@ -6866,14 +6866,14 @@ _02173350: .word 0x0000071c .global func_ov25_02173354 arm_func_start func_ov25_02173354 func_ov25_02173354: ; 0x02173354 - ldr ip, _0217336c ; =func_01ff9bc4 + ldr ip, _0217336c ; =Vec3p_Add mov r2, r0 add r0, r2, #0x48 add r1, r2, #0x60 add r2, r2, #0x48 bx ip .align 2, 0 -_0217336c: .word func_01ff9bc4 +_0217336c: .word Vec3p_Add arm_func_end func_ov25_02173354 .global func_ov25_02173370 @@ -8653,7 +8653,7 @@ _02174aa4: add r1, r0, #0x48 add r0, r4, #0x48 mov r2, r5 - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, [sp, #0x13c] mov r1, #0 mov r0, r2, asr #0x1f @@ -11013,7 +11013,7 @@ func_ov25_02176b88: ; 0x02176b88 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 mov r1, #0 bl func_01fffd04 @@ -12346,7 +12346,7 @@ func_ov25_02177bbc: ; 0x02177bbc ldrsh ip, [r5, ip] str lr, [sp, #4] str ip, [sp, #0xc] - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, [sp, #8] mov r1, #0 add r0, r0, #0xcd @@ -12483,7 +12483,7 @@ func_ov25_02177dc4: ; 0x02177dc4 ldr r0, _02177efc ; =gPlayerPos add r1, r4, #0x48 add r2, r4, #0x60 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [r4, #0x64] ldr r0, [r4, #0x60] @@ -12662,7 +12662,7 @@ _02177fe0: add r1, r4, #0x60 mov r2, r0 str r3, [r4, #0x64] - bl func_01ff9bc4 + bl Vec3p_Add ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02178090: .word data_027e0764 @@ -13682,7 +13682,7 @@ func_ov25_02178d0c: ; 0x02178d0c ldr r0, _02178d84 ; =gPlayerPos add r2, sp, #0 add r1, r4, #0x34c - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, _02178d88 ; =gPlayer add r1, r4, #0x34c ldr r0, [r0] diff --git a/asm/ov26.inc b/asm/ov26.inc index 8f9b8716..ea17f32d 100644 --- a/asm/ov26.inc +++ b/asm/ov26.inc @@ -156,11 +156,11 @@ .extern func_01ff9158 .extern func_01ff9b4c .extern func_01ff9b88 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9cec -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Length +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffbe34 .extern func_01ffe468 diff --git a/asm/ov26.s b/asm/ov26.s index 8a6056da..dbcbed3a 100644 --- a/asm/ov26.s +++ b/asm/ov26.s @@ -746,7 +746,7 @@ func_ov26_0216dde4: ; 0x0216dde4 add r2, sp, #0x10 mov r0, r5 str r3, [sp, #0x24] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0x1000 ldr r1, [sp, #0x10] rsb r0, r0, #0 @@ -759,7 +759,7 @@ func_ov26_0216dde4: ; 0x0216dde4 strgt r0, [sp, #0x10] _0216de54: add r0, sp, #0x10 - bl func_01ff9cec + bl Vec3p_Length mov r5, r0 add r1, sp, #0 mov r0, r4 @@ -1031,7 +1031,7 @@ func_ov26_0216e11c: ; 0x0216e11c add r1, sp, #0x30 str r3, [sp, #0x30] mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldrb r0, [r9, #0x14] ldrb r2, [r9, #0x15] cmp r0, #0 @@ -1089,7 +1089,7 @@ _0216e1e4: str r5, [sp, #0x24] str r4, [sp, #0x28] str r3, [sp, #0x2c] - bl func_01ff9bf8 + bl Vec3p_Sub mov r2, r5 mov r1, #0x3000 str r2, [sp, #0x18] @@ -1099,7 +1099,7 @@ _0216e1e4: str r2, [sp, #0x20] add r1, sp, #0x18 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #7 @@ -2965,7 +2965,7 @@ func_ov26_0216f920: ; 0x0216f920 add r2, sp, #0xc add r1, r4, #0x48 str r3, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0xc mov r3, #0 mov r2, r0 @@ -3024,7 +3024,7 @@ func_ov26_0216fa04: ; 0x0216fa04 add r2, sp, #4 add r1, r4, #0x48 str r3, [sp, #0x18] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #4 mov r3, #0 ldr r1, _0216fb14 ; =0x000004cd @@ -3187,12 +3187,12 @@ _0216fc2c: str r6, [sp, #0x10] str lr, [sp, #0x14] str ip, [sp, #0x18] - bl func_01ff9e64 + bl Vec3p_Axpy add r1, r5, #0xdc add r0, sp, #0x28 add r2, sp, #0x1c add r1, r1, #0x400 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x1c mov r3, #0 mov r2, r0 @@ -3203,13 +3203,13 @@ _0216fc2c: add r0, r1, #0x400 mov r2, r0 add r1, sp, #0x1c - bl func_01ff9bc4 + bl Vec3p_Add add r1, r5, #0xdc mov r0, #0x1000 add r1, r1, #0x400 mov r2, r4 add r3, sp, #4 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r2, [sp, #4] ldr r1, [r5, #0x48] mov r0, r5 @@ -3287,7 +3287,7 @@ func_ov26_0216fdb0: ; 0x0216fdb0 add r2, sp, #0xc mov r0, r3 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0xc mov r3, #0 mov r2, r0 @@ -3535,7 +3535,7 @@ func_ov26_02170088: ; 0x02170088 mov r0, r1 add r1, r4, #0x48 add r2, r4, #0x60 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [r4, #0x64] add r0, r4, #0x60 @@ -3638,7 +3638,7 @@ func_ov26_02170194: ; 0x02170194 add r1, r4, #0x48 add r2, r4, #0x60 str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r4, #0x60 ldr r1, _0217025c ; =0x000004cd mov r2, r0 @@ -3853,7 +3853,7 @@ func_ov26_02170320: ; 0x02170320 add r3, r3, #0x300 add r3, r7, r3 str r3, [sp, #0xc] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #8] mov r0, r4 str r1, [r4, #0x48] @@ -5853,11 +5853,11 @@ func_ov26_02171f24: ; 0x02171f24 add r0, sp, #0x6c add r1, sp, #0 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x6c add r1, sp, #0xc add r2, sp, #0x54 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp] ldr r1, [sp, #0xc] rsb r0, r0, #0 @@ -5867,11 +5867,11 @@ func_ov26_02171f24: ; 0x02171f24 add r1, sp, #0 mov r2, r0 str r3, [sp, #0xc] - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x60 add r1, sp, #0xc add r2, sp, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x9c] cmp r0, #0 beq _0217207c @@ -6182,7 +6182,7 @@ _02172454: str ip, [sp, #0x30] str r3, [sp, #0x34] str ip, [sp, #0x38] - bl func_01ff9bf8 + bl Vec3p_Sub mov r2, #0x800 mov r1, #0x1000 str r1, [sp, #0x28] @@ -6191,7 +6191,7 @@ _02172454: str r2, [sp, #0x24] str r2, [sp, #0x2c] mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r5, r0, #7 @@ -6731,7 +6731,7 @@ func_ov26_02172b14: ; 0x02172b14 mov r2, lr str ip, [sp, #0x30] str r3, [sp, #0x34] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _02172d38 ; =0x00001333 add r0, sp, #0x50 str r1, [sp, #0x20] @@ -6741,7 +6741,7 @@ func_ov26_02172b14: ; 0x02172b14 str r1, [sp, #0x28] add r1, sp, #0x20 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #7 @@ -6788,7 +6788,7 @@ func_ov26_02172b14: ; 0x02172b14 add r1, sp, #0x14 mov r2, r0 str r3, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x50 ldr ip, _02172d3c ; =0x00002666 mov lr, #0x2000 @@ -6798,7 +6798,7 @@ func_ov26_02172b14: ; 0x02172b14 str lr, [sp, #8] str ip, [sp, #0xc] str r3, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add ldr r3, [sp, #0x5c] ldr r2, [sp, #0x60] ldr r1, [sp, #0x64] @@ -7536,7 +7536,7 @@ func_ov26_021735bc: ; 0x021735bc str r5, [sp, #0x2c] str r3, [sp, #0x30] str r5, [sp, #0x34] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x38 ldr r3, _0217372c ; =0x00001333 add r1, sp, #0x20 @@ -7544,7 +7544,7 @@ func_ov26_021735bc: ; 0x021735bc str r5, [sp, #0x20] str r3, [sp, #0x24] str r5, [sp, #0x28] - bl func_01ff9bc4 + bl Vec3p_Add mov ip, #0 bic r1, ip, #0x1f orr r1, r1, #7 @@ -9288,7 +9288,7 @@ func_ov26_02174678: ; 0x02174678 str ip, [sp, #0x14] str r3, [sp, #0x18] str ip, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r2, _0217478c ; =0x00000666 mov r1, #0x1000 str r1, [sp, #0xc] @@ -9297,7 +9297,7 @@ func_ov26_02174678: ; 0x02174678 str r2, [sp, #8] str r2, [sp, #0x10] mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f orr r0, r0, #6 @@ -11756,7 +11756,7 @@ func_ov26_02176554: ; 0x02176554 str r5, [sp, #0x2c] str r3, [sp, #0x30] str r5, [sp, #0x34] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x38 ldr r3, _021766c0 ; =0x00001333 add r1, sp, #0x20 @@ -11764,7 +11764,7 @@ func_ov26_02176554: ; 0x02176554 str r5, [sp, #0x20] str r3, [sp, #0x24] str r5, [sp, #0x28] - bl func_01ff9bc4 + bl Vec3p_Add mov r3, #0 bic r0, r3, #0x1f orr r0, r0, #7 @@ -12243,7 +12243,7 @@ func_ov26_02176b44: ; 0x02176b44 str r3, [sp, #0x3c] str r5, [sp, #0x4c] str r5, [sp, #0x40] - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0x800 ldr r2, _02176cac ; =0x0000059a str r1, [sp, #0x20] @@ -12253,7 +12253,7 @@ func_ov26_02176b44: ; 0x02176b44 str r2, [sp, #0x28] add r1, sp, #0x20 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r6, #0 bic r0, r6, #0x1f orr r0, r0, #7 @@ -12673,10 +12673,10 @@ _0217717c: add r2, sp, #0 mov r0, r6 mov r1, r5 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize mov r0, #0x5000 add r2, r6, #0xc mov r5, #0 @@ -12690,13 +12690,13 @@ _0217717c: add r1, sp, #0 mov r3, r2 orr r0, r0, r4, lsl #20 - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, r6 add r1, r6, #0xc mov r2, r6 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r6, #0xc - bl func_01ff9cec + bl Vec3p_Length ldr r1, [r6, #0x18] add r0, r1, r0 str r0, [r6, #0x18] @@ -14396,7 +14396,7 @@ _0217868c: str r5, [sp, #0x14] str r4, [sp, #0x18] str r3, [sp, #0x1c] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 str r0, [r10, #0x78] str r0, [r10, #0x7c] @@ -14881,7 +14881,7 @@ func_ov26_02178cbc: ; 0x02178cbc str r2, [sp, #0x18] ldr r1, [r1, #8] str r1, [sp, #0x1c] - bl func_01ff9cec + bl Vec3p_Length ldr r1, _02178e3c ; =0x00000102 cmp r0, r1 blt _02178d54 @@ -14928,7 +14928,7 @@ _02178d78: str r2, [sp, #0xc] ldr r1, [r1, #8] str r1, [sp, #0x10] - bl func_01ff9cec + bl Vec3p_Length ldr r1, _02178e3c ; =0x00000102 cmp r0, r1 blt _02178e0c @@ -15225,7 +15225,7 @@ func_ov26_02179114: ; 0x02179114 str ip, [sp, #0x14] str r6, [sp, #0x18] str r3, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _02179234 ; =0x00004ccd mov r2, #0x1000 str r1, [sp, #0xc] @@ -15235,7 +15235,7 @@ func_ov26_02179114: ; 0x02179114 str r2, [sp, #8] add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x44 add lr, sp, #0x20 ldmia r0, {r0, r1, r2} diff --git a/asm/ov27.inc b/asm/ov27.inc index 8f95f344..a57567e3 100644 --- a/asm/ov27.inc +++ b/asm/ov27.inc @@ -128,10 +128,10 @@ .extern func_01ff8e84 .extern func_01ff9158 .extern func_01ff9958 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffbe34 diff --git a/asm/ov27.s b/asm/ov27.s index 1fb8391e..5aa52791 100644 --- a/asm/ov27.s +++ b/asm/ov27.s @@ -890,7 +890,7 @@ _0216e2b8: mov r0, r3 mov r2, r3 add r1, sp, #0x50 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x44] ldr r1, [sp, #0x4c] bl func_01ffa0f4 @@ -1027,7 +1027,7 @@ _0216e4f4: ldr r0, _0216e950 ; =gPlayerPos add r1, r5, #0x48 add r2, sp, #0x38 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x38] ldr r1, [sp, #0x40] bl func_01ffa0f4 @@ -1473,7 +1473,7 @@ _0216eb54: add r0, sp, #0 add r1, r4, #0x48 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -1697,7 +1697,7 @@ _0216eee8: add r0, sp, #0x48 add r2, sp, #0x3c add r1, r6, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x3c] ldr r1, [sp, #0x44] bl func_01ffa0f4 @@ -1957,7 +1957,7 @@ _0216f2a0: add r0, sp, #0x18 add r2, sp, #0xc add r1, r6, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] bl func_01ffa0f4 @@ -4077,7 +4077,7 @@ _02171010: add r0, r10, #0x48 mov r1, r5 mov r2, r4 - bl func_01ff9bf8 + bl Vec3p_Sub cmp r8, #0x3000 mov r7, #0x1f4 bge _02171094 @@ -4152,19 +4152,19 @@ _021710d8: mov r1, r4 mov r2, r5 mov r3, r4 - bl func_01ff9e64 + bl Vec3p_Axpy b _02171154 _02171140: mov r0, #0x3000 mov r1, r4 mov r2, r5 mov r3, r4 - bl func_01ff9e64 + bl Vec3p_Axpy _02171154: mov r0, r4 add r1, r10, #0x48 add r2, sp, #0x20 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [sp, #0x24] add r0, sp, #0x20 @@ -4202,7 +4202,7 @@ _02171154: add r0, r10, #0x48 mov r1, r5 mov r2, r4 - bl func_01ff9bf8 + bl Vec3p_Sub cmp r9, #1 ldr r0, [r10, #0xc4] str r0, [sp, #8] @@ -4229,7 +4229,7 @@ _02171244: sub r0, r0, r6 mov r1, r11 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, r10 bl _ZN5Actor14DistanceToLinkEv mov r8, r0 @@ -4245,7 +4245,7 @@ _02171288: add r1, sp, #0x14 add r0, r10, #0x48 mov r2, r1 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r2, [sp, #0x1c] ldr r4, [sp, #0x14] smull r1, r0, r2, r2 @@ -4763,7 +4763,7 @@ _021718e0: add r1, sp, #0xc mov r0, r3 mov r2, r3 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -4936,13 +4936,13 @@ func_ov27_02171b14: ; 0x02171b14 add r2, sp, #0x2c add r0, r6, #0xb8 add r1, r6, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [sp, #0x30] add r0, r6, #0x148 add r1, sp, #0x2c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r6, #0xb8] str r0, [r6, #0x48] ldr r0, [r6, #0xbc] @@ -5323,7 +5323,7 @@ _021720f0: add r1, r6, #0x48 add r0, r6, #0x60 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x5c bl func_ov00_020ccef0 ldrb r0, [r6, #0x398] @@ -5337,7 +5337,7 @@ _021720f0: add r0, r6, #0x48 add r1, sp, #0x5c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add _02172154: mov r0, r6 bl func_ov27_02172ab8 @@ -5490,7 +5490,7 @@ _021722d0: add r1, sp, #0x44 strlt r0, [r6, #0x50] add r0, r6, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x38 bl func_01fffb4c cmp r0, #0 @@ -5509,7 +5509,7 @@ _021723e0: add r0, sp, #0x44 add r1, sp, #0x38 add r2, r6, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add _021723f0: ldr r0, _02172490 ; =data_027e0d0c ldr r1, [r0] @@ -5726,7 +5726,7 @@ func_ov27_02172598: ; 0x02172598 add r0, sp, #0x48 add r1, r5, #0x48 add r2, sp, #0x3c - bl func_01ff9bc4 + bl Vec3p_Add add r0, r5, #0x300 ldr r4, [r0] add r1, sp, #0x9c @@ -5753,11 +5753,11 @@ func_ov27_02172598: ; 0x02172598 add r1, sp, #0x30 add r0, r5, #0x35c add r2, r5, #0x368 - bl func_01ff9bc4 + bl Vec3p_Add add r2, sp, #0x24 add r0, r5, #0x35c add r1, r5, #0x368 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #0x24] ldr r0, [sp, #0x28] mov r1, r1, asr #0x1 @@ -5874,7 +5874,7 @@ func_ov27_02172844: ; 0x02172844 str r3, [r4, #0x370] add r1, r4, #0x35c add r2, sp, #4 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #0xc] ldr r0, [sp, #8] mov r3, r1, asr #0x1 @@ -6017,10 +6017,10 @@ func_ov27_02172ab8: ; 0x02172ab8 add r1, sp, #0xc add r0, r4, #0x48 mov r2, r1 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0xc mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r1, _02172ccc ; =0x00002666 add r0, sp, #0xc bl func_01fffbec @@ -6749,7 +6749,7 @@ func_ov27_02173430: ; 0x02173430 ldr r1, _0217355c ; =data_ov27_02178f8c mov r0, r3 mov r2, r3 - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #4 str r1, [sp] ldr r0, _02173560 ; =data_027e0fe8 @@ -7926,7 +7926,7 @@ func_ov27_02174320: ; 0x02174320 ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -9396,7 +9396,7 @@ func_ov27_02175660: ; 0x02175660 add r2, sp, #0 add r0, r4, #0x14 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -10886,7 +10886,7 @@ _02176b24: add r0, r10, #0x48 mov r1, r5 mov r2, r4 - bl func_01ff9bf8 + bl Vec3p_Sub cmp r8, #0x3000 mov r7, #0x12c bge _02176ba4 @@ -10962,19 +10962,19 @@ _02176bec: mov r1, r4 mov r2, r5 mov r3, r4 - bl func_01ff9e64 + bl Vec3p_Axpy b _02176c68 _02176c54: mov r0, #0x3000 mov r1, r4 mov r2, r5 mov r3, r4 - bl func_01ff9e64 + bl Vec3p_Axpy _02176c68: mov r0, r4 add r1, r10, #0x48 add r2, sp, #0x20 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [sp, #0x24] add r0, sp, #0x20 @@ -11013,7 +11013,7 @@ _02176c68: add r0, r10, #0x48 mov r1, r5 mov r2, r4 - bl func_01ff9bf8 + bl Vec3p_Sub cmp r9, #1 ldr r0, [r10, #0xc4] str r0, [sp, #8] @@ -11040,7 +11040,7 @@ _02176d5c: sub r0, r0, r6 mov r1, r11 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, r10 bl _ZN5Actor14DistanceToLinkEv mov r8, r0 @@ -11056,7 +11056,7 @@ _02176da0: add r1, sp, #0x14 add r0, r10, #0x48 mov r2, r1 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r2, [sp, #0x1c] ldr r4, [sp, #0x14] smull r1, r0, r2, r2 @@ -11309,10 +11309,10 @@ func_ov27_021770e8: ; 0x021770e8 str r3, [sp, #0x1c] str lr, [sp, #0x20] str ip, [sp, #0x24] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x10 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize mov r3, #0x800 str r3, [sp, #0x28] mov r3, #2 @@ -11749,7 +11749,7 @@ _0217772c: add r0, sp, #0x18 add r2, sp, #0xc add r1, r7, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] bl func_01ffa0f4 @@ -13407,7 +13407,7 @@ func_ov27_02178c14: ; 0x02178c14 add r0, sp, #0x40 add r1, sp, #0x34 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #4 str r0, [sp] ldr r0, _02178cf0 ; =data_027e0e58 diff --git a/asm/ov28.inc b/asm/ov28.inc index c5ba6eef..800133fa 100644 --- a/asm/ov28.inc +++ b/asm/ov28.inc @@ -136,11 +136,11 @@ .extern func_01ff8aa0 .extern func_01ff8abc .extern func_01ff8e84 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9cec -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Length +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01fffbec diff --git a/asm/ov28.s b/asm/ov28.s index d350d189..6298e4e3 100644 --- a/asm/ov28.s +++ b/asm/ov28.s @@ -4064,7 +4064,7 @@ func_ov28_02170b54: ; 0x02170b54 add r0, r1, #0x400 add r2, sp, #0x14 add r1, r3, #0x400 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x14] ldr r1, [sp, #0x1c] bl func_01ffa0f4 @@ -4078,7 +4078,7 @@ func_ov28_02170b54: ; 0x02170b54 mov r3, #0 mov r0, ip str r3, [sp, #0xc] - bl func_01ff9cec + bl Vec3p_Length mov r1, r0 ldr r0, [sp, #0x18] bl func_01ffa0f4 @@ -5462,7 +5462,7 @@ func_ov28_02171d10: ; 0x02171d10 str r5, [sp, #0x4c] str r4, [sp, #0x50] str r3, [sp, #0x54] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x58 mov r4, #0x3000 mov r3, #0x400 @@ -5471,7 +5471,7 @@ func_ov28_02171d10: ; 0x02171d10 str r5, [sp, #0x40] str r4, [sp, #0x44] str r3, [sp, #0x48] - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 ldr r2, [r9, #4] bic r0, r1, #0x1f @@ -5881,7 +5881,7 @@ func_ov28_02172280: ; 0x02172280 str r5, [sp, #0x30] str r4, [sp, #0x34] str r3, [sp, #0x38] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r3, _0217244c ; =0x0000059a add r0, sp, #0x3c mov r4, #0x3000 @@ -5890,7 +5890,7 @@ func_ov28_02172280: ; 0x02172280 str r5, [sp, #0x24] str r4, [sp, #0x28] str r3, [sp, #0x2c] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r9, #4] mov r0, r9 orr r1, r1, #0x14 @@ -7792,7 +7792,7 @@ _02173a54: str r2, [sp, #0xc] ldr r2, [r4, #0xc] str r2, [sp, #0x10] - bl func_01ff9d4c + bl Vec3p_Normalize ldr r1, [sp, #0xc] ldr r2, [sp, #8] rsb r3, r1, #0 @@ -7808,7 +7808,7 @@ _02173a54: add r0, sp, #0x14 add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8308,7 +8308,7 @@ _02174118: ldr r2, [r1, #0xc] mov r1, r0 str r2, [sp, #0x10] - bl func_01ff9d4c + bl Vec3p_Normalize ldr r1, [sp, #0xc] ldr r2, [sp, #8] rsb r3, r1, #0 @@ -8324,7 +8324,7 @@ _02174118: add r0, sp, #0x14 add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -12873,7 +12873,7 @@ func_ov28_02177bec: ; 0x02177bec add r1, r4, #0x60 mov r2, r0 str r3, [r4, #0x68] - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x170 add r1, r4, #8 bl func_ov00_020ccf0c @@ -12883,7 +12883,7 @@ func_ov28_02177bec: ; 0x02177bec add r1, r4, #0x170 mov r3, r2 mov r0, #0x800 - bl func_01ff9e64 + bl Vec3p_Axpy _02177cd0: mov r0, r4 mov r1, #0 diff --git a/asm/ov29.inc b/asm/ov29.inc index 1152f900..9e53a55b 100644 --- a/asm/ov29.inc +++ b/asm/ov29.inc @@ -122,12 +122,12 @@ .extern func_01ff992c .extern func_01ff9958 .extern func_01ff9b4c -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c2c -.extern func_01ff9cec -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Dot +.extern Vec3p_Length +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01fffb4c diff --git a/asm/ov29.s b/asm/ov29.s index 03c7c7c0..7fef7de9 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -3475,12 +3475,12 @@ func_ov29_02170468: ; 0x02170468 add r2, sp, #0x34 add r0, r5, #0x228 add r1, r5, #0x234 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r5, #0x24c] add r1, sp, #0x34 add r2, r5, #0x234 add r3, r5, #0x48 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, [r5, #0x24c] ldr r3, [r5, #0x254] mov r0, r0, lsl #0x1 @@ -3636,12 +3636,12 @@ func_ov29_021706ac: ; 0x021706ac add r2, sp, #0x34 add r0, r5, #0x228 add r1, r5, #0x234 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r5, #0x24c] add r1, sp, #0x34 add r2, r5, #0x234 add r3, r5, #0x48 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [r5, #0x4c] ldr r0, [r5, #0x22c] subs r0, r1, r0 @@ -3847,12 +3847,12 @@ func_ov29_021709c0: ; 0x021709c0 add r2, sp, #4 add r0, r5, #0x228 add r1, r5, #0x234 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r5, #0x24c] add r1, sp, #4 add r2, r5, #0x234 add r3, r5, #0x48 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, [r5, #0x24c] ldr ip, [r5, #0x254] mov r0, r0, lsl #0x1 @@ -4054,12 +4054,12 @@ func_ov29_02170ca0: ; 0x02170ca0 add r2, sp, #0x34 add r0, r5, #0x228 add r1, r5, #0x234 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r5, #0x24c] add r1, sp, #0x34 add r2, r5, #0x234 add r3, r5, #0x48 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r2, [r5, #0x24c] ldr r1, _02170e78 ; =0x00000666 mov r0, #0 @@ -4241,12 +4241,12 @@ _02170f74: add r2, sp, #0x34 add r0, r5, #0x228 add r1, r5, #0x234 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r5, #0x24c] add r1, sp, #0x34 add r2, r5, #0x234 add r3, r5, #0x48 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [r5, #0x4c] ldr r0, [r5, #0x22c] subs r0, r1, r0 @@ -4485,7 +4485,7 @@ _021712ac: ldr r0, [r5, #0xc] add r1, sp, #0x18 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy _02171304: ldrsh r1, [r5, #2] add r0, sp, #0x24 @@ -5296,10 +5296,10 @@ _02171d5c: add r2, sp, #0xc mov r0, r3 add r1, r6, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0xc mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot mov r4, r0 cmp r4, #0x10000 mov r5, #0x16c @@ -5469,7 +5469,7 @@ _02171f74: add r2, r5, #0x48 mov r0, #0x1800 str ip, [sp, #0x20] - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [sp, #0x1c] ldr r0, [sp, #0x10] add r2, r1, #0x800 @@ -5761,7 +5761,7 @@ _02172360: add r1, r5, #0x1f8 mov r3, r2 mov r0, #0x800 - bl func_01ff9e64 + bl Vec3p_Axpy _021723b4: ldr r0, [r5, #0x4c] mov r2, #0xb800 @@ -6194,7 +6194,7 @@ func_ov29_02172938: ; 0x02172938 bne _02172ba0 add r0, r5, #4 add r1, r6, #0x22c - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 bge _02172ba0 ldr r0, [r5, #0x14] @@ -6207,7 +6207,7 @@ func_ov29_02172938: ; 0x02172938 mov r1, #0 mov r0, r3 str r1, [sp, #0x34] - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0xc000 addgt sp, sp, #0x3c movgt r0, #0 @@ -6500,7 +6500,7 @@ _02172d60: add r0, sp, #0 mov r1, r3 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add _02172d88: ldr r1, _02172dd8 ; =data_ov38_02189238 add r0, sp, #0 @@ -6514,7 +6514,7 @@ _02172d88: add r0, sp, #0 mov r2, r5 add r1, r1, #0x14 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 @@ -6938,7 +6938,7 @@ func_ov29_02173314: ; 0x02173314 str r3, [sp, #4] ldr r3, [ip, #0x50] str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r2, [sp, #0x18] ldr r0, [r4, #0x278] ldr r1, _021733f0 ; =0x00000266 @@ -6971,7 +6971,7 @@ func_ov29_02173314: ; 0x02173314 ldr r2, [r4, #0x204] add r1, r2, #0x60 add r2, r2, #0x60 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0x24 ldmia sp!, {r3, r4, pc} .align 2, 0 @@ -7198,7 +7198,7 @@ _021736d4: add r0, sp, #0xc add r1, sp, #0 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #0xc add r0, r5, #0x244 mov r2, #0x400 @@ -7480,7 +7480,7 @@ _02173af4: str r3, [sp, #0x28] str r2, [sp, #0x24] mov r5, r1, asr #0x10 - bl func_01ff9cec + bl Vec3p_Length sub r2, r0, #0x400 cmp r2, #0xac00 movgt r2, #0xac00 @@ -7514,7 +7514,7 @@ _02173b44: add r0, r4, #0x25c add r1, sp, #0x14 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub b _02173bbc _02173bb4: sub r0, r0, #1 @@ -7565,7 +7565,7 @@ _02173c0c: add r1, r4, #0x238 add r2, r4, #0x25c mov r0, #0x800 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, _02174020 ; =data_027e0e58 mov r5, #0 ldr r6, [r0] @@ -7912,7 +7912,7 @@ _02174090: add r0, sp, #0x18 str r2, [sp, #0x20] str r1, [sp, #0x1c] - bl func_01ff9cec + bl Vec3p_Length sub r0, r0, #0x400 cmp r0, #0xb000 movgt r0, #0xb000 @@ -8064,7 +8064,7 @@ _02174340: add r1, r4, #0x238 add r2, r4, #0x25c mov r0, #0x800 - bl func_01ff9e64 + bl Vec3p_Axpy ldrb r0, [r4, #0xa4] cmp r0, #0 ldreqb r0, [r4, #0xa5] @@ -9399,7 +9399,7 @@ func_ov29_021755b4: ; 0x021755b4 add r2, sp, #0 add r1, r5, #0x48 mov r4, #0x400 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r2, [sp, #8] ldr ip, [sp] smull r1, r0, r2, r2 @@ -9666,7 +9666,7 @@ func_ov29_02175900: ; 0x02175900 add r2, sp, #0xc add r0, r6, #0x48 add r1, r6, #0x7c - bl func_01ff9bc4 + bl Vec3p_Add ldrb r0, [r6, #0x2c1] cmp r0, #0 beq _02175a18 @@ -9710,7 +9710,7 @@ func_ov29_02175900: ; 0x02175900 add r1, r6, #0x7c add r2, r6, #0x48 str r3, [sp, #0x14] - bl func_01ff9bf8 + bl Vec3p_Sub _02175a18: ldr lr, [sp, #0xc] ldr ip, [sp, #0x10] @@ -9721,7 +9721,7 @@ _02175a18: str lr, [sp] str ip, [sp, #4] str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r6, #0x284 bl func_01fffb4c cmp r0, #0 @@ -9829,13 +9829,13 @@ func_ov29_02175b4c: ; 0x02175b4c add r1, r4, #0x7c add r2, r4, #0x290 strb r3, [r4, #0x2c2] - bl func_01ff9bc4 + bl Vec3p_Add add r2, sp, #0x18 add r0, r4, #0x29c add r1, r4, #0x290 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x18 - bl func_01ff9cec + bl Vec3p_Length mov r1, r0 mov r0, #0x1000 bl Divide @@ -9863,7 +9863,7 @@ func_ov29_02175b4c: ; 0x02175b4c mov r0, r3 add r1, r2, #0x60 add r2, r2, #0x60 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02175d34 ; =data_027e0ffc ldr r1, _02175d38 ; =0x00000434 add r2, r4, #0x48 @@ -9892,7 +9892,7 @@ _02175c50: mov r0, r3 add r1, r2, #0x60 add r2, r2, #0x60 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x2b4] sub r0, r0, #1 str r0, [r4, #0x2b4] @@ -10102,14 +10102,14 @@ func_ov29_02175ed0: ; 0x02175ed0 ldr r0, _02175ff0 ; =0x00001333 add r1, r5, #0x260 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy add r1, r5, #0x260 add r0, r5, #0x284 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r5, #0x260 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize _02175fc0: add r0, r5, #0x160 ldr r4, [r0] @@ -10492,7 +10492,7 @@ func_ov29_02176468: ; 0x02176468 str ip, [sp, #0x2c] str r3, [sp, #0x30] str ip, [sp, #0x34] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _02176550 ; =0x0000099a ldr r0, _02176554 ; =0x00001333 str r1, [sp, #0x20] @@ -10501,7 +10501,7 @@ func_ov29_02176468: ; 0x02176468 str r1, [sp, #0x28] add r1, sp, #0x20 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 bic r0, r0, #0x1f ldrh r1, [r4, #0x24] @@ -12407,7 +12407,7 @@ _02177e54: add r1, r4, #0x48 add r0, r4, #0x60 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x250] cmp r0, #0 movne r0, #0 @@ -12443,7 +12443,7 @@ func_ov29_02177e9c: ; 0x02177e9c add r1, r4, #0x48 add r2, r4, #0x60 str r3, [sp, #4] - bl func_01ff9bf8 + bl Vec3p_Sub mov r2, #0 ldr r1, _02177f1c ; =0x00000333 add r0, r4, #0x60 @@ -12488,7 +12488,7 @@ func_ov29_02177f28: ; 0x02177f28 add r1, r4, #0x48 add r0, r4, #0x60 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x4c] cmp r0, #0x800 bge _02177f98 @@ -13829,7 +13829,7 @@ _021790ac: ldr r0, [r0] ldr r0, [r0, #4] add r0, r0, #0x260 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4, #0xc] ldr r0, [r5, #0xac] rsb r9, r1, #0 diff --git a/asm/ov30.inc b/asm/ov30.inc index a56e1d5a..8a268eb4 100644 --- a/asm/ov30.inc +++ b/asm/ov30.inc @@ -105,9 +105,9 @@ .extern func_01ff8e84 .extern func_01ff9158 .extern func_01ff9958 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffbe34 diff --git a/asm/ov30.s b/asm/ov30.s index 9f30d4c5..84d705e8 100644 --- a/asm/ov30.s +++ b/asm/ov30.s @@ -1576,7 +1576,7 @@ func_ov30_0217d09c: ; 0x0217d09c add r2, sp, #0x4c mov r0, r4 add r1, r7, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, r4 add r0, r7, #0x48 bl func_ov00_020c5464 @@ -1874,7 +1874,7 @@ func_ov30_0217d4e8: ; 0x0217d4e8 add r2, sp, #0xc mov r0, r4 add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, r4 add r0, r5, #0x48 bl func_ov00_020c5464 @@ -3120,7 +3120,7 @@ _0217e620: str r10, [sp, #0x28] str ip, [sp, #0x24] str lr, [sp, #0x2c] - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, r5 mov r1, r7 bl func_ov00_020cca68 @@ -3157,7 +3157,7 @@ _0217e6ac: str r10, [sp, #0x10] str ip, [sp, #0xc] str lr, [sp, #0x14] - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, r5 mov r1, r7 bl func_ov00_020cca68 @@ -5258,7 +5258,7 @@ _02180330: str r6, [sp] str lr, [sp, #4] str ip, [sp, #8] - bl func_01ff9e64 + bl Vec3p_Axpy add r1, sp, #0xc mov r0, r4 mov r2, #0 @@ -9037,7 +9037,7 @@ func_ov30_02182f0c: ; 0x02182f0c add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldrh r4, [r5, #0x9c] mov r1, #0 mov r0, r5 @@ -14007,11 +14007,11 @@ _02186ed8: add r0, sp, #0x34 add r2, sp, #0x1c add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x28 add r1, sp, #0x34 add r2, sp, #0x10 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x1c] ldr r1, [sp, #0x24] bl func_01ffa0f4 diff --git a/asm/ov31.inc b/asm/ov31.inc index e2a28560..e25235fd 100644 --- a/asm/ov31.inc +++ b/asm/ov31.inc @@ -99,9 +99,9 @@ .extern func_01ff83a0 .extern func_01ff8690 .extern func_01ff88b0 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9d4c +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Normalize .extern func_01fffbec .extern func_020079d8 .extern func_0200e2a4 diff --git a/asm/ov31.s b/asm/ov31.s index 7a1f1f24..29d4a54d 100644 --- a/asm/ov31.s +++ b/asm/ov31.s @@ -670,7 +670,7 @@ _0217c574: add r1, sp, #0x24 add r0, r0, #0x48 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #0x24] ldr r0, [sp, #0x28] str r1, [sp, #0xc] @@ -4098,10 +4098,10 @@ func_ov31_0217ee74: ; 0x0217ee74 str lr, [sp, #0xc] str ip, [sp, #0x10] str r3, [sp, #0x14] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r9 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize ldrb r0, [r5, #0x174] mov r1, #0x400 cmp r0, #1 @@ -4111,7 +4111,7 @@ func_ov31_0217ee74: ; 0x0217ee74 add r0, r5, #0x48 mov r1, r9 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, [sp, #0x28] ldr r0, [r5, #0x4c] cmp r0, r2 @@ -4128,7 +4128,7 @@ _0217ef70: add r0, r5, #0x48 mov r1, r9 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, [r5, #0x18] ldr r0, [r5, #0x4c] cmp r0, r2 @@ -4584,7 +4584,7 @@ _0217f4cc: add r0, sp, #0x48 add r1, r4, #0x260 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0217f634 ; =data_ov31_02183e88 str r5, [sp, #0x3c] ldr r0, [r0, #0x2c8] @@ -4610,7 +4610,7 @@ _0217f4cc: add r1, sp, #0x48 add r0, r6, #0x48 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x24 mov r1, r4 blx func_ov09_0211d090 diff --git a/asm/ov32.inc b/asm/ov32.inc index cafaf04f..455bd3c3 100644 --- a/asm/ov32.inc +++ b/asm/ov32.inc @@ -117,10 +117,10 @@ .extern func_01ff9158 .extern func_01ff991c .extern func_01ff9b88 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9cec -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Length +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffa9fc diff --git a/asm/ov32.s b/asm/ov32.s index fa2805f5..f5e580ee 100644 --- a/asm/ov32.s +++ b/asm/ov32.s @@ -1958,7 +1958,7 @@ _0217d570: ldr r1, [r5, #0x60] add r0, sp, #0x1c strh r1, [sp, #8] - bl func_01ff9cec + bl Vec3p_Length strh r0, [sp, #0xa] ldr r1, [r5, #0x68] add r0, sp, #8 @@ -2954,11 +2954,11 @@ func_ov32_0217e26c: ; 0x0217e26c str r3, [sp] str r3, [sp, #4] str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0xc add r1, sp, #0 add r2, r4, #0xc - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0x1c ldmia sp!, {r3, r4, pc} arm_func_end func_ov32_0217e26c @@ -3566,7 +3566,7 @@ _0217eaa0: ldr r1, [r5, #0x60] add r0, sp, #0x34 strh r1, [sp, #0x2c] - bl func_01ff9cec + bl Vec3p_Length strh r0, [sp, #0x2e] add r0, sp, #0x2c ldr r2, [r5, #0x68] @@ -5721,7 +5721,7 @@ func_ov32_021804a4: ; 0x021804a4 orr r4, r4, r3, lsl #20 add r3, r9, r4 str r3, [sp, #0x20] - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x18 bl func_ov00_020c5288 cmp r0, #0 @@ -6290,7 +6290,7 @@ func_ov32_02180e08: ; 0x02180e08 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x29c] cmp r0, #4 beq _02180e3c @@ -7890,7 +7890,7 @@ func_ov32_02182448: ; 0x02182448 add r0, r4, #0x78 add r1, r4, #0x18 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldmia sp!, {r4, pc} .align 2, 0 _0218248c: .word data_ov32_02185c10 @@ -7976,7 +7976,7 @@ func_ov32_0218252c: ; 0x0218252c add r0, sp, #0x24 add r1, r4, #0x78 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, _0218269c ; =gMapManager mov r0, r4 ldr r5, [r1] @@ -8204,7 +8204,7 @@ func_ov32_0218286c: ; 0x0218286c str r3, [sp, #0x18] str ip, [sp, #0x1c] str lr, [sp, #0x20] - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0xa8 ldr r3, [r0] add r1, sp, #0x24 @@ -9183,12 +9183,12 @@ func_ov32_02183540: ; 0x02183540 add r2, sp, #0 add r0, r4, #0x230 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r2, r4, #0x60 add r1, sp, #0 mov r3, r2 mov r0, #0xcd - bl func_01ff9e64 + bl Vec3p_Axpy add r0, r4, #0x60 ldr r2, _0218359c ; =0x00000333 mov r3, r0 @@ -9401,16 +9401,16 @@ func_ov32_02183818: ; 0x02183818 add r0, sp, #0x18 add r1, r4, #0x230 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x18 add r2, sp, #0xc add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r2, r4, #0x60 add r1, sp, #0xc mov r3, r2 mov r0, #0xcd - bl func_01ff9e64 + bl Vec3p_Axpy add r0, r4, #0x60 ldr r1, _021838d0 ; =0x00000333 mov r2, r0 diff --git a/asm/ov33.inc b/asm/ov33.inc index b1b74930..0210fd71 100644 --- a/asm/ov33.inc +++ b/asm/ov33.inc @@ -87,9 +87,9 @@ .extern data_ov00_020e9370 .extern data_ov00_020eec9c .extern func_01ff9958 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffe1cc diff --git a/asm/ov33.s b/asm/ov33.s index 18f979fd..9e5e5033 100644 --- a/asm/ov33.s +++ b/asm/ov33.s @@ -964,14 +964,14 @@ func_ov33_0217c98c: ; 0x0217c98c .global func_ov33_0217c9a8 arm_func_start func_ov33_0217c9a8 func_ov33_0217c9a8: ; 0x0217c9a8 - ldr ip, _0217c9c0 ; =func_01ff9bc4 + ldr ip, _0217c9c0 ; =Vec3p_Add mov r2, r0 add r0, r2, #0x48 add r1, r2, #0x60 add r2, r2, #0x48 bx ip .align 2, 0 -_0217c9c0: .word func_01ff9bc4 +_0217c9c0: .word Vec3p_Add arm_func_end func_ov33_0217c9a8 .global func_ov33_0217c9c4 @@ -2898,7 +2898,7 @@ func_ov33_0217e1c8: ; 0x0217e1c8 mov r0, #0x5000 str ip, [sp, #0x1c] str r5, [sp, #0x20] - bl func_01ff9e64 + bl Vec3p_Axpy add sp, sp, #0x24 ldmia sp!, {r4, r5, r6, r7, pc} _0217e29c: @@ -2951,7 +2951,7 @@ _0217e29c: mov r0, #0x5000 str ip, [sp, #0x10] str r5, [sp, #0x14] - bl func_01ff9e64 + bl Vec3p_Axpy add sp, sp, #0x24 ldmia sp!, {r4, r5, r6, r7, pc} _0217e36c: @@ -2991,7 +2991,7 @@ _0217e36c: str r7, [sp] str r6, [sp, #4] str r5, [sp, #8] - bl func_01ff9e64 + bl Vec3p_Axpy add sp, sp, #0x24 ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 @@ -3039,12 +3039,12 @@ func_ov33_0217e450: ; 0x0217e450 mov r1, r3 mov r2, r3 add r0, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r1, sp, #0 add r2, r4, #0x48 mov r3, r1 mov r0, #0xa000 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r2, _0217e4ac ; =0x0000028f add r1, sp, #0 mov r0, r4 @@ -4534,7 +4534,7 @@ func_ov33_0217f744: ; 0x0217f744 add r3, r4, #0x48 str r6, [sp] str r5, [sp, #8] - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [r4, #0x4c] mov r0, r4 add r1, r1, #0x800 @@ -4606,7 +4606,7 @@ func_ov33_0217f8b0: ; 0x0217f8b0 mov r4, r6, lsr #0xc orr r4, r4, r3, lsl #20 str r4, [ip, #0x68] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 diff --git a/asm/ov34.inc b/asm/ov34.inc index 19024814..26e51b45 100644 --- a/asm/ov34.inc +++ b/asm/ov34.inc @@ -91,9 +91,9 @@ .extern data_ov22_0217a5d4 .extern func_01ff88b0 .extern func_01ff9158 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffa9fc diff --git a/asm/ov34.s b/asm/ov34.s index d4f086b1..a8010676 100644 --- a/asm/ov34.s +++ b/asm/ov34.s @@ -970,13 +970,13 @@ _0217c998: str r3, [r1, #0x50] ldr r1, [r1, #0x40] add r1, r1, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, _0217cdf4 ; =data_ov34_021861a0 ldr r0, _0217cdf8 ; =data_ov34_021861e8 ldr r1, [r1, #0x44] mov r2, r0 add r1, r1, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0217cdf4 ; =data_ov34_021861a0 mov r1, #0x2800 ldr r2, [r0, #0x48] @@ -1273,7 +1273,7 @@ func_ov34_0217ceb0: ; 0x0217ceb0 add r2, sp, #0 mov r1, r6 mov r4, r3 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r2, [r5] mul r1, r0, r4 @@ -1311,7 +1311,7 @@ func_ov34_0217ceb0: ; 0x0217ceb0 add r3, r4, #0x800 mov r3, r3, asr #0xc str r3, [r5, #8] - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, pc} arm_func_end func_ov34_0217ceb0 @@ -1587,12 +1587,12 @@ func_ov34_0217d290: ; 0x0217d290 ldr r1, [sp, #0x18] add r2, sp, #0 str ip, [r3, #0x18] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r2, [sp, #0x18] ldr r3, [sp, #0x20] add r1, sp, #0 mov r0, r4 - bl func_01ff9e64 + bl Vec3p_Axpy add sp, sp, #0xc ldmia sp!, {r4, r5, pc} arm_func_end func_ov34_0217d290 @@ -2125,7 +2125,7 @@ _0217dad0: ldr r0, _0217dea4 ; =data_ov34_021862fc ldr r1, _0217dec4 ; =data_ov34_02186320 add r2, sp, #0x6c - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, [sp, #0x6c] ldr r1, [sp, #0x70] ldr r0, [sp, #0x74] @@ -2187,7 +2187,7 @@ _0217db48: ldr r0, _0217dea4 ; =data_ov34_021862fc ldr r1, _0217dec4 ; =data_ov34_02186320 add r2, sp, #0x54 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #0x54] ldr r0, [sp, #0x58] str r1, [sp, #0x18] @@ -3237,7 +3237,7 @@ func_ov34_0217ea88: ; 0x0217ea88 ldr r0, _0217eb18 ; =gPlayerPos add r2, sp, #4 add r1, r1, #0x1c00 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #4] ldr r1, [sp, #0xc] bl func_01ffa0f4 @@ -3321,7 +3321,7 @@ func_ov34_0217eb94: ; 0x0217eb94 ldr r0, _0217ee3c ; =gPlayerPos add r2, sp, #0x3c add r1, r1, #0x1c00 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x3c] ldr r1, [sp, #0x44] bl func_01ffa0f4 @@ -3588,7 +3588,7 @@ func_ov34_0217ef88: ; 0x0217ef88 add r2, sp, #0x10 add r0, r0, #0x18 add r1, r1, #0x1c00 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp, #0x18] ldr r0, [sp, #0x10] cmp r1, #0x3800 @@ -3719,7 +3719,7 @@ func_ov34_0217f120: ; 0x0217f120 add r2, sp, #0x1c add r0, r0, #0x18 add r1, r1, #0x1c00 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp, #0x24] ldr r0, [sp, #0x1c] cmp r1, #0x3800 @@ -4031,7 +4031,7 @@ _0217f604: ldr r0, _0217f708 ; =gPlayerPos add r2, sp, #0x10 add r1, r3, #0x1c00 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x10] ldr r1, [sp, #0x18] bl func_01ffa0f4 @@ -4182,7 +4182,7 @@ func_ov34_0217f7c8: ; 0x0217f7c8 ldr r0, _02180074 ; =gPlayerPos add r2, sp, #0x74 add r1, r1, #0x1c00 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x74] ldr r1, [sp, #0x7c] bl func_01ffa0f4 @@ -4599,7 +4599,7 @@ _0217fe74: ldr r0, _021800b8 ; =data_ov34_02185788 add r2, sp, #0x10 add r1, r1, #0x1c00 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0x14] add r1, r5, #0x1000 add r0, r0, #0x400 @@ -4860,7 +4860,7 @@ _02180200: ldr r0, _02180318 ; =gPlayerPos add r2, sp, #0x10 add r1, r3, #0x1c00 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp, #0x18] ldr r0, [sp, #0x10] cmp r1, #0x5800 @@ -5011,7 +5011,7 @@ func_ov34_021803c0: ; 0x021803c0 ldr r0, _02180818 ; =gPlayerPos add r2, sp, #0x44 add r1, r1, #0x1c00 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp, #0x4c] ldr r0, [sp, #0x44] cmp r1, #0x5800 @@ -5301,7 +5301,7 @@ func_ov34_02180854: ; 0x02180854 add r2, sp, #0xc add r0, r5, #0x1d40 add r1, r1, #0x1c00 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x10] ldr r1, [sp, #0x14] rsb r0, r0, #0 @@ -5511,7 +5511,7 @@ _02180a70: mov r0, #0x2000 add r1, sp, #0x80 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [sp, #0x74] add r0, r4, #0x1000 str r1, [r0, #0xd34] @@ -5546,7 +5546,7 @@ _02180ba8: add r1, sp, #0x68 mov r3, r2 mov r0, #0x2000 - bl func_01ff9e64 + bl Vec3p_Axpy add r0, r4, #0x1000 ldr r1, [r0, #0xcd8] ldr r0, [r0, #0xd68] @@ -5658,7 +5658,7 @@ _02180d84: add r1, sp, #0x68 mov r2, r3 mov r0, #0x4000 - bl func_01ff9e64 + bl Vec3p_Axpy mov r1, #0 mov r0, #0x1000 str r0, [sp, #0x4c] @@ -6571,7 +6571,7 @@ func_ov34_02181a00: ; 0x02181a00 add r0, sp, #0x50 add r2, sp, #0x38 add r1, r1, #0x1c00 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x38] ldr r1, [sp, #0x40] bl func_01ffa0f4 @@ -6750,7 +6750,7 @@ func_ov34_02181d24: ; 0x02181d24 add r2, sp, #0 add r0, r4, #0x48 add r1, r4, #0x7c - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp] add r0, r4, #0x1000 str r1, [r4, #0x48] @@ -7372,7 +7372,7 @@ _021825cc: add r0, sp, #0x1c add r1, sp, #0x10 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r5, #0x1000 ldr r0, [r0, #0xcec] cmp r0, #0 @@ -7502,7 +7502,7 @@ _02182790: add r0, sp, #0x30 add r1, sp, #0x24 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, _02182af0 ; =0x00001003 add r1, r4, #0xec str r2, [sp] @@ -7573,7 +7573,7 @@ _02182860: add r2, sp, #0x18 add r0, r0, #0x1000 add r1, r1, #0x1000 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #0x1c] ldr r3, [sp, #0x18] ldr r0, [sp, #0x20] @@ -7689,7 +7689,7 @@ _02182a1c: add r2, sp, #0xc add r0, r0, #0x1000 add r1, r1, #0x1000 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #0x10] ldr r3, [sp, #0xc] ldr r0, [sp, #0x14] @@ -8128,7 +8128,7 @@ func_ov34_02182fc8: ; 0x02182fc8 orr ip, ip, r2, lsl #20 mov r2, r0 str ip, [r3, #0x68] - bl func_01ff9bc4 + bl Vec3p_Add ldmia sp!, {r3, pc} arm_func_end func_ov34_02182fc8 @@ -8366,7 +8366,7 @@ func_ov34_0218333c: ; 0x0218333c mov r0, r1 add r1, r5, #0x48 add r2, r5, #0x7c - bl func_01ff9bf8 + bl Vec3p_Sub str r4, [r5, #0x88] ldmia sp!, {r3, r4, r5, pc} arm_func_end func_ov34_0218333c @@ -8469,7 +8469,7 @@ func_ov34_02183474: ; 0x02183474 ldr r1, _02183cf8 ; =data_ov34_0218577c add r0, r10, #0x48 add r2, r2, #0x1c00 - bl func_01ff9bc4 + bl Vec3p_Add add r4, r10, #0x1000 ldrb r0, [r4, #0xd88] cmp r0, #0 @@ -8499,7 +8499,7 @@ _02183510: ldr r3, [r4, #0xd30] add r2, sp, #0x9c str r3, [sp, #0x4c] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [r4, #0xd04] add r0, sp, #0x38 str r1, [sp, #0x38] @@ -8509,7 +8509,7 @@ _02183510: ldr r3, [r4, #0xd0c] add r2, sp, #0x90 str r3, [sp, #0x40] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x80 add r1, sp, #0x90 add r2, sp, #0x9c @@ -9274,11 +9274,11 @@ _02184084: add r1, sp, #0 add r2, r2, #0x1c00 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add add r2, sp, #0xc add r0, r6, #0x48 add r1, r6, #0x7c - bl func_01ff9bc4 + bl Vec3p_Add add r2, sp, #0xc mov r0, r4 mov r1, r5 @@ -9344,7 +9344,7 @@ _021841b4: ldr r0, _021843c0 ; =data_ov34_02185788 add r2, sp, #0x18 add r1, r1, #0x1c00 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0x1c] add r1, sp, #0x18 sub r3, r0, #0x33 @@ -10081,7 +10081,7 @@ func_ov34_02184b70: ; 0x02184b70 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x18c] add r2, r4, #0x60 cmp r0, #1 @@ -10258,7 +10258,7 @@ _02184df8: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4, #0x16c] add r0, r4, #0x4c ldr r1, [r1, #0x4c] diff --git a/asm/ov35.inc b/asm/ov35.inc index ec4b047b..f027552c 100644 --- a/asm/ov35.inc +++ b/asm/ov35.inc @@ -119,10 +119,10 @@ .extern func_01ff8aa0 .extern func_01ff8e84 .extern func_01ff9158 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9cec -.extern func_01ff9d4c +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Length +.extern Vec3p_Normalize .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffa9fc diff --git a/asm/ov35.s b/asm/ov35.s index 3a337856..b0dafc46 100644 --- a/asm/ov35.s +++ b/asm/ov35.s @@ -791,7 +791,7 @@ _0217c844: add r2, sp, #0x10 add r0, r1, #0x48 add r1, r1, #0x54 - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, [sp, #0x10] ldr r1, [sp, #0x14] ldr r0, [sp, #0x18] @@ -1025,7 +1025,7 @@ _0217cb3c: add r1, sp, #0x5c add r0, r4, #0x48 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1580,7 +1580,7 @@ _0217d2b8: ldr r1, [sp] mov r0, r4 mov r2, r4 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0217d3a4 ; =data_027e0e58 mov r1, r8 ldr r0, [r0] @@ -1725,7 +1725,7 @@ _0217d468: add r0, sp, #0x6c add r1, r6, #0x48 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0217d754 ; =data_027e0e58 ldr r1, [sp, #0x14] ldr r0, [r0] @@ -1845,7 +1845,7 @@ _0217d680: add r0, sp, #0x6c add r1, r6, #0x48 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0217d754 ; =data_027e0e58 ldr r1, [sp, #4] ldr r0, [r0] @@ -2532,7 +2532,7 @@ _0217df84: add r2, sp, #4 add r0, r5, #0x2e4 add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #4] ldr r1, [sp, #0xc] bl func_01ffa0f4 @@ -2718,7 +2718,7 @@ _0217e23c: ldr r3, [r5, #0x50] mov r2, r0 str r3, [r5, #0x5c] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 bl func_ov00_020cc3fc mov r0, r5 @@ -2937,7 +2937,7 @@ func_ov35_0217e524: ; 0x0217e524 add r0, sp, #8 add r1, r4, #0x48 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -3387,11 +3387,11 @@ func_ov35_0217e9ec: ; 0x0217e9ec add r0, sp, #0x18 add r1, sp, #0x24 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x24 add r1, sp, #0x18 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp, #0x3c] add r0, sp, #0x24 mov r1, r1, lsl #0x1 @@ -3402,7 +3402,7 @@ func_ov35_0217e9ec: ; 0x0217e9ec add r0, sp, #0x24 add r1, sp, #0x18 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0x40] sub r0, r0, r6, asr #16 str r0, [sp, #0x40] @@ -5365,7 +5365,7 @@ _02180808: ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0x20] - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -5536,7 +5536,7 @@ _02180a98: ldr r3, [r4, #0x50] mov r2, r0 str r3, [r4, #0x5c] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 mov r1, #0 bl func_01fffd04 @@ -6201,14 +6201,14 @@ _0218138c: str r2, [sp, #0x1c] ldr r2, [r5, #0xcc] str r2, [sp, #0x20] - bl func_01ff9d4c + bl Vec3p_Normalize ldr r1, _021813f0 ; =0x0000019a add r0, sp, #0x18 bl func_01fffbec add r1, r5, #0x48 add r0, sp, #0x18 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0x24 ldmia sp!, {r4, r5, pc} .align 2, 0 @@ -6402,11 +6402,11 @@ func_ov35_02181610: ; 0x02181610 add r2, sp, #4 add r0, r0, #0x400 add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #4 str r1, [sp, #8] - bl func_01ff9cec + bl Vec3p_Length ldrb r1, [r5, #0x566] mov r4, r0 cmp r1, #0 @@ -6456,7 +6456,7 @@ _02181714: add r0, r0, #0x400 add r1, r5, #0x48 add r2, r5, #0x60 - bl func_01ff9bf8 + bl Vec3p_Sub add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 @@ -6875,7 +6875,7 @@ _02181cd4: add r2, sp, #0 add r0, r0, #0x400 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -7727,7 +7727,7 @@ func_ov35_02182834: ; 0x02182834 ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02182940 ; =data_027e0e58 add r2, sp, #0xc ldr r0, [r0] @@ -8490,7 +8490,7 @@ _021832ec: add r0, sp, #0xc add r1, r4, #0x48 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _021833e8 ; =gPlayerLink add r1, sp, #0xc ldr r0, [r0] @@ -8522,7 +8522,7 @@ _0218332c: add r0, sp, #0 add r1, r4, #0x48 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _021833e8 ; =gPlayerLink add r1, sp, #0 ldr r0, [r0] @@ -8605,7 +8605,7 @@ _02183488: mov r0, r3 mov r2, r3 add r1, r1, #0x54 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #0x1c] ldr r0, [sp, #0x24] mov r1, r1, asr #0x1 @@ -8626,7 +8626,7 @@ _02183488: add r0, sp, #0x1c add r1, sp, #0 add r2, sp, #0x10 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x10] ldr r1, [sp, #0x18] bl func_01ffa0f4 @@ -8762,7 +8762,7 @@ _021836d4: add r0, sp, #0x18 add r1, sp, #0x28 add r2, sp, #0xc - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] bl func_01ffa0f4 @@ -9457,7 +9457,7 @@ func_ov35_02184054: ; 0x02184054 add r1, sp, #0x54 add r0, sp, #0x60 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0x54] str r0, [r4, #0x48] ldr r0, [sp, #0x58] @@ -9823,7 +9823,7 @@ func_ov35_0218451c: ; 0x0218451c str r1, [sp, #0x18] add r1, sp, #0x14 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -9865,7 +9865,7 @@ func_ov35_0218463c: ; 0x0218463c ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add add r7, r4, #0x37c ldr r4, _021846d0 ; =data_027e0e58 mov r6, #0 @@ -9899,11 +9899,11 @@ func_ov35_021846d4: ; 0x021846d4 str r2, [sp] str r1, [sp, #4] str r3, [sp, #8] - bl func_01ff9cec + bl Vec3p_Length mov r4, r0 add r0, sp, #0 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize ldr lr, [sp] mov r0, #0x6000 ldr r2, [sp, #8] @@ -9927,7 +9927,7 @@ func_ov35_021846d4: ; 0x021846d4 add r0, sp, #0 str r6, [sp] str r1, [sp, #8] - bl func_01ff9cec + bl Vec3p_Length cmp r4, r0 movlt r0, #0 movge r0, #1 @@ -10215,7 +10215,7 @@ func_ov35_02184aa4: ; 0x02184aa4 ldr r3, [r4, #0x50] add r2, r4, #0x60 str r3, [r4, #0x5c] - bl func_01ff9bf8 + bl Vec3p_Sub ldrb r0, [r4, #0x214] mov r1, #0x1a cmp r0, #0 @@ -10293,7 +10293,7 @@ _02184bc4: add r2, sp, #0x38 add r0, r1, #0x48 add r1, r1, #0x54 - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, [sp, #0x38] ldr r1, [sp, #0x3c] ldr r0, [sp, #0x40] @@ -10323,7 +10323,7 @@ _02184bc4: add r2, sp, #0 str ip, [sp, #0x10] str r3, [sp, #0x14] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -10365,7 +10365,7 @@ _02184ce0: add r0, sp, #0x18 add r2, sp, #0 add r1, r6, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 diff --git a/asm/ov36.inc b/asm/ov36.inc index 25afdc39..c0365cf3 100644 --- a/asm/ov36.inc +++ b/asm/ov36.inc @@ -105,10 +105,10 @@ .extern func_01ff892c .extern func_01ff8e84 .extern func_01ff9158 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9cec -.extern func_01ff9d4c +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Length +.extern Vec3p_Normalize .extern func_01ffa0f4 .extern func_01ffbe34 .extern func_01ffe1cc diff --git a/asm/ov36.s b/asm/ov36.s index f122afb6..7b2caa5d 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -243,7 +243,7 @@ func_ov36_0217c070: ; 0x0217c070 add r1, sp, #0x24 add r2, sp, #0x30 mov r0, r5 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x1c] ldr r3, _0217c11c ; =data_02050f54 ldrh r1, [r0, #0x78] @@ -2205,7 +2205,7 @@ _0217db28: ldr r3, [r4, #0x50] mov r2, r0 str r3, [r4, #0x5c] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 bl func_ov36_0218543c mov r0, r4 @@ -2601,7 +2601,7 @@ _0217e0c0: str r4, [sp, #0x38] str r3, [sp, #0x3c] str r3, [sp, #0x40] - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #0x38 mov r2, r6 add r0, r5, #0x820 @@ -5802,7 +5802,7 @@ func_ov36_02180d1c: ; 0x02180d1c mov r0, r3 add r1, r4, #0x48 add r2, sp, #0x2c - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _02180e20 ; =0x00000ccd mov r0, #2 str r1, [sp, #0x38] @@ -5853,7 +5853,7 @@ func_ov36_02180e24: ; 0x02180e24 str ip, [sp, #0x28] str r4, [sp, #0x2c] str r3, [sp, #0x30] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _02181020 ; =0x00000ccd ldr r0, [sp, #0x28] str r1, [sp, #0x44] @@ -7510,7 +7510,7 @@ _02182654: ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0x1c] - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -7552,7 +7552,7 @@ _02182654: ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8135,7 +8135,7 @@ func_ov36_02182f88: ; 0x02182f88 ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02183068 ; =data_027e0e58 add r1, r4, #0x294 ldr r0, [r0] @@ -9068,7 +9068,7 @@ _02183ce8: add r0, sp, #0x48 add r1, sp, #0x3c add r2, sp, #0x30 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x30] ldr r1, [sp, #0x38] bl func_01ffa0f4 @@ -9117,7 +9117,7 @@ _02183ce8: add r0, sp, #0x24 str r11, [sp, #0x28] str r2, [sp, #0x24] - bl func_01ff9cec + bl Vec3p_Length ldr r1, [sp, #0x54] add r0, r1, r0 cmp r0, r10 @@ -9415,7 +9415,7 @@ _02184160: str r1, [r6, #0x81c] add r1, r6, #0x48 mov r4, r3 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x24] ldr r1, [sp, #0x2c] bl func_01ffa0f4 @@ -9785,7 +9785,7 @@ _02184728: ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0x68] - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #0xa8 add r2, sp, #0x78 add r0, r4, #0x158 @@ -10773,7 +10773,7 @@ func_ov36_0218543c: ; 0x0218543c str r3, [sp] str ip, [sp, #4] mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x85c] subs r0, r0, #0x148 str r0, [r4, #0x85c] @@ -10958,7 +10958,7 @@ _0218571c: mov r2, #0 mov r1, r0 str r2, [sp, #0x10] - bl func_01ff9d4c + bl Vec3p_Normalize cmp r4, #0x8000 mov r0, #0x2000 blt _02185768 @@ -11297,7 +11297,7 @@ _02185bc0: ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x78 str r0, [sp] ldr r1, _02185c7c ; =func_ov36_0217bdb4 @@ -11381,7 +11381,7 @@ func_ov36_02185c84: ; 0x02185c84 ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0x34] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4, #0x48] add r0, sp, #0x50 str r1, [sp, #0x20] @@ -11391,7 +11391,7 @@ func_ov36_02185c84: ; 0x02185c84 ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0x28] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -11446,7 +11446,7 @@ _02185da4: ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0x1c] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4, #0x48] add r0, sp, #0x38 str r1, [sp, #8] @@ -11456,7 +11456,7 @@ _02185da4: ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -11509,7 +11509,7 @@ func_ov36_02185eb8: ; 0x02185eb8 ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0x1c] - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -11537,7 +11537,7 @@ func_ov36_02185eb8: ; 0x02185eb8 ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -11810,7 +11810,7 @@ func_ov36_021862b8: ; 0x021862b8 add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldrh r0, [r5, #0x20] cmp r0, #0 beq _0218633c diff --git a/asm/ov37.inc b/asm/ov37.inc index a4f1bb32..ad008db5 100644 --- a/asm/ov37.inc +++ b/asm/ov37.inc @@ -102,13 +102,13 @@ .extern func_01ff892c .extern func_01ff8e84 .extern func_01ff9158 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c2c -.extern func_01ff9c68 -.extern func_01ff9cec -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Dot +.extern Vec3p_Cross +.extern Vec3p_Length +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffa9fc diff --git a/asm/ov37.s b/asm/ov37.s index 982af418..36b327e1 100644 --- a/asm/ov37.s +++ b/asm/ov37.s @@ -957,7 +957,7 @@ _0217c978: str r3, [r5, #0x64] ldr r3, [r9, #8] str r3, [r5, #0x68] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] bl func_01ffa0f4 @@ -1040,7 +1040,7 @@ _0217cadc: str r3, [r6, #0x64] ldr r3, [r5, #8] str r3, [r6, #0x68] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] bl func_01ffa0f4 @@ -2726,7 +2726,7 @@ _0217e290: mov r1, ip mov r2, r3 mov r0, #0x1e000 - bl func_01ff9e64 + bl Vec3p_Axpy add r1, sp, #0xcc mov r0, r4 bl _ZN5Actor10GetAngleToEP5Vec3p @@ -2797,7 +2797,7 @@ _0217e380: str lr, [sp, #0xb4] str ip, [sp, #0xb8] str r7, [sp, #0xbc] - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, _0217e354 ; =gPlayerPos add r1, sp, #0xd8 ldr r6, [r0, #4] @@ -4083,7 +4083,7 @@ func_ov37_0217f668: ; 0x0217f668 add r2, sp, #4 add r1, r4, #0x2f80 str ip, [r3, #0xf8c] - bl func_01ff9bf8 + bl Vec3p_Sub mov ip, #2 add r2, sp, #4 mov r0, r4 @@ -9714,7 +9714,7 @@ func_ov37_0218452c: ; 0x0218452c mov r0, r1 add r1, r4, #0x48 add r2, r4, #0x184 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r4, #0x184] cmp r0, #0 ldreq r0, [r4, #0x188] @@ -9730,7 +9730,7 @@ func_ov37_0218452c: ; 0x0218452c _0218457c: add r0, r4, #0x184 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize mov r0, #0x800 cmp r5, #0 ldrne r0, _02184688 ; =0x0000099a @@ -9760,7 +9760,7 @@ _0218457c: bl func_01ffa0f4 strh r0, [r4, #0x78] add r0, r4, #0x60 - bl func_01ff9cec + bl Vec3p_Length str r0, [r4, #0x178] mov r3, #0 mov r1, #0x1000 @@ -9770,11 +9770,11 @@ _0218457c: add r1, r4, #0x184 str r3, [sp, #0xc] str r3, [sp, #0x14] - bl func_01ff9c68 + bl Vec3p_Cross add r1, sp, #0 add r0, r4, #0x184 add r2, sp, #0xc - bl func_01ff9c68 + bl Vec3p_Cross ldr r0, [sp] str r0, [r4, #0x190] ldr r0, [sp, #4] @@ -9871,11 +9871,11 @@ func_ov37_02184758: ; 0x02184758 add r2, sp, #0x18 add r0, r4, #0x54 add r1, r4, #0x7c - bl func_01ff9bc4 + bl Vec3p_Add add r2, sp, #0xc add r0, r4, #0x48 add r1, r4, #0x7c - bl func_01ff9bc4 + bl Vec3p_Add add r0, r4, #0x60 str r0, [sp] mov r0, #2 @@ -9937,7 +9937,7 @@ _02184850: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0x800 ldr r1, [r5, #0x4c] rsb r0, r0, #0 @@ -9987,7 +9987,7 @@ _021848fc: add r1, r5, #0x60 mov r2, r0 strh ip, [r3, #0x80] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 bl _ZN5Actor12ApplyGravityEv _02184928: @@ -10069,7 +10069,7 @@ func_ov37_021849a4: ; 0x021849a4 bl func_ov00_020a61ac add r0, sp, #0x20 add r1, sp, #0x2c - bl func_01ff9c2c + bl Vec3p_Dot mov r3, #0x1800 rsb r3, r3, #0 mvn ip, #0 @@ -10084,7 +10084,7 @@ func_ov37_021849a4: ; 0x021849a4 orr r0, r0, r3, lsl #20 add r1, sp, #0x2c mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy add r0, sp, #0x14 mov r1, #0x400 bl func_01fffbec @@ -12565,7 +12565,7 @@ func_ov37_02186b68: ; 0x02186b68 add r0, r1, #0x400 add r2, sp, #0x20 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 ldr r3, _02186ca8 ; =0x66666667 str r1, [sp, #0x24] @@ -12664,7 +12664,7 @@ func_ov37_02186cdc: ; 0x02186cdc add r2, sp, #0 add r0, r4, #0x14 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 ldr r1, _02186d38 ; =0x000004cd mov r2, r0 @@ -12993,7 +12993,7 @@ _021870d0: str r1, [sp, #0x48] add r1, r4, #0x48 add r2, sp, #8 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp, #0x44] mov r0, r4 str r1, [r4, #0x48] @@ -13540,7 +13540,7 @@ func_ov37_021878ac: ; 0x021878ac str lr, [sp] str ip, [sp, #4] str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #0x18 add r2, sp, #0xc mov r0, r4 @@ -13566,7 +13566,7 @@ func_ov37_021878ac: ; 0x021878ac str r1, [sp, #8] add r1, sp, #0x18 add r2, sp, #0xc - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 add r1, sp, #0x18 add r2, sp, #0xc @@ -13603,7 +13603,7 @@ func_ov37_021878ac: ; 0x021878ac add r2, sp, #0xc str ip, [sp, #4] str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #0x18 add r2, sp, #0xc mov r0, r4 @@ -13635,7 +13635,7 @@ func_ov37_021878ac: ; 0x021878ac add r0, sp, #0 add r1, sp, #0x18 add r2, sp, #0xc - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 add r1, sp, #0x18 add r2, sp, #0xc @@ -13672,7 +13672,7 @@ func_ov37_021878ac: ; 0x021878ac str r1, [sp, #8] add r1, sp, #0x18 add r2, sp, #0xc - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #0x18 add r2, sp, #0xc mov r0, r4 @@ -13704,7 +13704,7 @@ func_ov37_021878ac: ; 0x021878ac add r2, sp, #0xc str ip, [sp, #4] str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #0x18 mov r0, r4 add r2, sp, #0xc @@ -13787,7 +13787,7 @@ func_ov37_02187c5c: ; 0x02187c5c ldr r0, _02187ce4 ; =gPlayerPos add r2, sp, #0x1c add r1, r4, #0x54 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, _02187ce8 ; =gPlayer ldr r1, [r4, #0x4c] ldr lr, [r4, #0x50] @@ -13829,7 +13829,7 @@ func_ov37_02187cec: ; 0x02187cec ldr r0, _02187d84 ; =gPlayerPos add r2, sp, #0x1c add r1, r4, #0x54 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, _02187d88 ; =gPlayer ldr lr, [r4, #0x4c] ldr ip, [r4, #0x50] diff --git a/asm/ov38.inc b/asm/ov38.inc index f072cc11..c1be74e5 100644 --- a/asm/ov38.inc +++ b/asm/ov38.inc @@ -102,13 +102,13 @@ .extern func_01ff8230 .extern func_01ff9958 .extern func_01ff9b4c -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c2c -.extern func_01ff9c68 -.extern func_01ff9cec -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Dot +.extern Vec3p_Cross +.extern Vec3p_Length +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffa94c diff --git a/asm/ov38.s b/asm/ov38.s index ebb3f077..c80b5688 100644 --- a/asm/ov38.s +++ b/asm/ov38.s @@ -962,10 +962,10 @@ func_ov38_0217ca70: ; 0x0217ca70 mov r0, r7 mov r1, r6 mov r4, r3 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 mov r1, r0 - bl func_01ff9c2c + bl Vec3p_Dot ldr r1, [sp, #0x20] mul r2, r1, r1 cmp r0, r2, asr #12 @@ -998,7 +998,7 @@ _0217cb0c: mov r0, r5 mov r2, r6 mov r3, r6 - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, #0 add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, pc} @@ -1015,7 +1015,7 @@ func_ov38_0217cb2c: ; 0x0217cb2c add r2, sp, #0 mov r1, r6 mov r4, r3 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r3, [r5] smull r2, r1, r0, r4 @@ -1068,7 +1068,7 @@ func_ov38_0217cb2c: ; 0x0217cb2c mov r4, r4, lsr #0xc orr r4, r4, r3, lsl #20 str r4, [r5, #8] - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, pc} arm_func_end func_ov38_0217cb2c @@ -1832,11 +1832,11 @@ func_ov38_0217d6d8: ; 0x0217d6d8 add r2, sp, #0x10 add r0, r4, #0x48 add r1, r4, #0x14 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0x10 str r1, [sp, #0x14] - bl func_01ff9cec + bl Vec3p_Length cmp r0, #0x1400 ble _0217d760 add r0, sp, #0x10 @@ -1848,27 +1848,27 @@ func_ov38_0217d6d8: ; 0x0217d6d8 add r3, r4, #0x48 mov r0, #0x1400 ldr r5, [r4, #0x4c] - bl func_01ff9e64 + bl Vec3p_Axpy add r0, sp, #0x10 add r1, r4, #0x60 str r5, [r4, #0x4c] - bl func_01ff9c2c + bl Vec3p_Dot ldr r2, _0217d904 ; =0xffffe99a add r1, sp, #0x10 mul r2, r0, r2 mov r0, r2, asr #0xc add r2, r4, #0x60 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy _0217d760: ldr r1, _0217d908 ; =gPlayerPos add r2, sp, #0x10 add r0, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0x10 str r1, [sp, #0x14] - bl func_01ff9cec + bl Vec3p_Length mov r5, r0 cmp r5, #0x5000 bge _0217d7b8 @@ -1882,12 +1882,12 @@ _0217d760: add r1, sp, #0x10 mov r0, r0, asr #0xc mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy _0217d7b8: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4, #0x60] ldr r0, _0217d90c ; =0x00000d9a mov r2, #0x200 @@ -2017,7 +2017,7 @@ func_ov38_0217d918: ; 0x0217d918 mov r3, r2, asr #0xc mov r2, r1 str r3, [r7, #0x68] - bl func_01ff9bc4 + bl Vec3p_Add add r0, r7, #0x48 add r1, r7, #0x14 bl func_01ff9ec0 @@ -2112,11 +2112,11 @@ func_ov38_0217dad0: ; 0x0217dad0 add r2, sp, #0x10 add r0, r4, #0x48 add r1, r4, #0x14 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0x10 str r1, [sp, #0x14] - bl func_01ff9cec + bl Vec3p_Length mov r5, r0 cmp r5, #0x2800 ble _0217db58 @@ -2129,16 +2129,16 @@ func_ov38_0217dad0: ; 0x0217dad0 add r3, r4, #0x48 mov r0, #0x2800 ldr r5, [r4, #0x4c] - bl func_01ff9e64 + bl Vec3p_Axpy add r0, sp, #0x10 add r1, r4, #0x60 str r5, [r4, #0x4c] - bl func_01ff9c2c + bl Vec3p_Dot add r2, r4, #0x60 add r1, sp, #0x10 rsb r0, r0, #0 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy b _0217dbbc _0217db58: ldr r0, [r4, #0x2d8] @@ -2166,12 +2166,12 @@ _0217db9c: add r1, sp, #0x10 mov r0, r0, asr #0xc mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy _0217dbbc: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, [r4, #0x60] ldr r0, _0217dcd4 ; =0x00000f33 mov r1, #0 @@ -2406,7 +2406,7 @@ func_ov38_0217dec0: ; 0x0217dec0 add r2, sp, #0x3c add r0, r0, #0xc00 str r3, [sp, #0x18] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp, #0x40] add r0, sp, #0x3c add r1, r1, #0x1000 @@ -2486,7 +2486,7 @@ func_ov38_0217dfe4: ; 0x0217dfe4 add r2, sp, #0x5c add r0, r0, #0xc00 str r3, [sp, #0x18] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x5c bl func_01fffb4c cmp r0, #0 @@ -2665,11 +2665,11 @@ func_ov38_0217e26c: ; 0x0217e26c add r2, sp, #0x4c add r0, r0, #0xc00 str r3, [sp, #0x18] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x4c mov r1, r4 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x4c bl func_01fffb4c cmp r0, #0 @@ -2749,11 +2749,11 @@ func_ov38_0217e3a4: ; 0x0217e3a4 add r2, sp, #0x4c add r0, r0, #0xc00 str r3, [sp, #0x18] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x4c mov r1, r4 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x4c bl func_01fffb4c cmp r0, #0 @@ -2819,11 +2819,11 @@ func_ov38_0217e4e0: ; 0x0217e4e0 add r2, sp, #0 add r1, r7, #0x14 ldr r5, [r3, #0x78] - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0 str r1, [sp, #4] - bl func_01ff9cec + bl Vec3p_Length add r1, r7, #0x1000 ldr r2, _0217e678 ; =gPlayerPos ldrsh r3, [r1, #0x94] @@ -3019,11 +3019,11 @@ func_ov38_0217e77c: ; 0x0217e77c str r3, [sp, #0x10] ldr r3, [r5, #0x1c] str r3, [sp, #0x14] - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0x30 str r1, [sp, #0x34] - bl func_01ff9cec + bl Vec3p_Length mov r6, r0 cmp r6, #0xb800 movgt r6, #0xb800 @@ -3053,7 +3053,7 @@ _0217e820: ldr r3, [r5, #0x1c] mov r2, r0 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add mov r2, #0 add r1, sp, #0x30 mov r0, r4 @@ -3070,7 +3070,7 @@ _0217e820: add r1, r5, #0x60 add r0, sp, #0x24 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0217e8bc ; =data_027e0ffc ldr r1, _0217e8c0 ; =0x00000431 add r2, r5, #0x48 @@ -3114,11 +3114,11 @@ func_ov38_0217e8c4: ; 0x0217e8c4 strh r6, [sp, #2] strh r5, [sp, #4] str r3, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0x44 str r1, [sp, #0x48] - bl func_01ff9cec + bl Vec3p_Length mov r5, r0 cmp r5, #0xb800 movgt r5, #0xb800 @@ -3148,7 +3148,7 @@ _0217e97c: ldr r3, [r4, #0x1c] mov r2, r0 str r3, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add mov r8, #0 str r8, [sp, #0x48] add r7, sp, #0x44 @@ -3179,7 +3179,7 @@ _0217e9c4: add r1, r4, #0x60 add r0, sp, #0x2c mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0217ea50 ; =data_027e0ffc ldr r1, _0217ea54 ; =0x00000431 add r2, r4, #0x48 @@ -4051,7 +4051,7 @@ _0217f608: add r0, sp, #0x28 add r1, sp, #0x34 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0xe3c] cmp r0, #0 bne _0217f6b8 @@ -4118,7 +4118,7 @@ _0217f744: add r0, sp, #0x10 add r1, sp, #0x34 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0xe40] cmp r0, #0 bne _0217f7b4 @@ -5309,11 +5309,11 @@ _02180784: str r3, [sp, #0x14] ldr r3, [r4, #0x1c] str r3, [sp, #0x18] - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0x34 str r1, [sp, #0x38] - bl func_01ff9cec + bl Vec3p_Length mov r6, r0 cmp r6, #0xb800 movgt r6, #0xb800 @@ -5343,7 +5343,7 @@ _02180840: ldr r3, [r4, #0x1c] mov r2, r0 str r3, [sp, #0xc] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0x12000 str r0, [sp, #0x38] add r0, r4, #0x1000 @@ -5382,7 +5382,7 @@ _021808cc: add r1, r4, #0x60 add r0, sp, #0x28 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02180a58 ; =data_027e0ffc ldr r1, _02180a5c ; =0x00000432 add r2, r4, #0x48 @@ -8030,7 +8030,7 @@ func_ov38_02182e3c: ; 0x02182e3c ldr r3, [r3, #0x50] mov r2, r0 str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0xc bl func_01fffb4c cmp r0, #0 @@ -8041,7 +8041,7 @@ func_ov38_02182e3c: ; 0x02182e3c add r0, r8, #0x60 add r1, sp, #0xc mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add _02182ec0: mov r4, #0 ldr r5, _0218306c ; =data_ov38_02189224 @@ -8210,12 +8210,12 @@ _021830a4: mov r1, r5 mov r2, r7 mov r3, r7 - bl func_01ff9e64 + bl Vec3p_Axpy add r0, r4, #0x2c00 mov r1, r5 mov r2, r6 mov r3, r6 - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, r8 mov r1, r7 mov r2, r6 @@ -8460,7 +8460,7 @@ _0218341c: add r2, r8, #0x38 str r3, [sp, #8] mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy _0218348c: mov r0, r6 bl func_ov38_021855c8 @@ -8590,7 +8590,7 @@ _021835f4: add r2, sp, #0x1c mov r0, r3 add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldrsh r1, [r5, #0x78] add r0, sp, #0x1c rsb r1, r1, #0 @@ -8630,11 +8630,11 @@ _021836c8: mov r2, r3 rsb r0, r0, #0 add r1, r1, #0xc00 - bl func_01ff9e64 + bl Vec3p_Axpy add r0, sp, #4 add r2, sp, #0x1c add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldrsh r1, [r5, #0x78] add r0, sp, #0x1c rsb r1, r1, #0 @@ -8742,7 +8742,7 @@ _02183870: add r0, r5, #0x388 add r0, r0, #0xc00 add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r5, #0x1000 ldrb r0, [r0, #0xab] ldrsh r1, [r5, #0x78] @@ -8784,7 +8784,7 @@ _0218392c: add r0, r5, #0x388 add r0, r0, #0xc00 add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldrsh r1, [r5, #0x78] add r0, sp, #0x18 rsb r1, r1, #0 @@ -8804,7 +8804,7 @@ _02183980: add r0, r5, #0x358 add r0, r0, #0xc00 add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldrsh r1, [r5, #0x78] add r0, sp, #0x18 rsb r1, r1, #0 @@ -8829,7 +8829,7 @@ _021839cc: add r2, sp, #0xc add r0, r0, #0xc00 add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldrsh r1, [r5, #0x78] add r0, sp, #0xc rsb r1, r1, #0 @@ -9057,17 +9057,17 @@ func_ov38_02183cb4: ; 0x02183cb4 ldr r1, _02183d60 ; =gPlayerPos add r2, sp, #0xc add r0, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub mov r2, #0 add r0, sp, #0xc add r1, sp, #0 str r2, [sp, #0x10] - bl func_01ff9d4c + bl Vec3p_Normalize add r2, r5, #0x60 ldr r0, _02183d64 ; =0x000004cd add r1, sp, #0 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy add r0, r5, #0x1000 mov r1, #0 strh r1, [r0, #0x86] @@ -9252,7 +9252,7 @@ _02183f60: str r2, [r6, #0x64] ldr r2, [r5, #0xc] str r2, [r6, #0x68] - bl func_01ff9d4c + bl Vec3p_Normalize ldr r0, [r6, #0x60] add r1, r6, #0x1000 mov r0, r0, lsl #0xa @@ -9506,7 +9506,7 @@ _021842c4: str r3, [sp, #0x2c] ldr r3, [r5, #0x1c] str r3, [sp, #0x30] - bl func_01ff9bf8 + bl Vec3p_Sub sub r0, r4, r11 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 @@ -9522,7 +9522,7 @@ _021842c4: bl func_ov00_020a61ac add r0, sp, #0xb4 add r1, sp, #0xa8 - bl func_01ff9c2c + bl Vec3p_Dot cmp r0, #0 bge _02184374 mov r1, #0x8000 @@ -9619,7 +9619,7 @@ _0218446c: add r0, sp, #0x58 add r1, r5, #0x14 add r2, sp, #0x4c - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0x1c] add r3, sp, #0x7c str r0, [sp, #0x20] @@ -10275,7 +10275,7 @@ func_ov38_02184d9c: ; 0x02184d9c str r3, [sp] mov r9, r1 str r3, [r10, #0x234] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0x1000 mov r1, #3 mov r4, #0 @@ -10296,7 +10296,7 @@ _02184de4: mov r2, r8 str r3, [r7, #0x40] mov r3, r8 - bl func_01ff9e64 + bl Vec3p_Axpy add r6, r6, #1 ldr r1, [r11, #8] ldmia r11, {r0, r2} @@ -10391,7 +10391,7 @@ func_ov38_02184ee8: ; 0x02184ee8 ldr r0, _021854c8 ; =0x00000e66 mov r1, r8 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy add r0, r10, #0x200 ldrsh r1, [r0, #0x3a] add r1, r1, #0x500 @@ -10412,7 +10412,7 @@ func_ov38_02184ee8: ; 0x02184ee8 mov r0, r3 mov r2, r3 add r1, r5, #0x34 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 add r0, sp, #0x80 str r1, [sp, #0x84] @@ -10424,12 +10424,12 @@ func_ov38_02184ee8: ; 0x02184ee8 bl func_ov00_020a61ac add r0, sp, #0x80 add r1, sp, #0x8c - bl func_01ff9c2c + bl Vec3p_Dot add r2, sp, #0x8c rsb r0, r0, #0 add r1, sp, #0x80 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy _0218500c: add r0, r10, #0x200 ldrh r1, [r0, #0x3a] @@ -10481,9 +10481,9 @@ _021850ac: add r1, r5, #0x34 add r2, sp, #0xc8 moveq r4, #0 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0xc8 - bl func_01ff9cec + bl Vec3p_Length str r0, [sp, #8] add r0, sp, #0xc8 bl func_01fffb4c @@ -10508,9 +10508,9 @@ _02185110: add r0, r4, #0x34 add r1, r5, #0x34 add r2, sp, #0xbc - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0xbc - bl func_01ff9cec + bl Vec3p_Length str r0, [sp, #0xc] add r0, sp, #0xbc bl func_01fffb4c @@ -10543,9 +10543,9 @@ _02185198: add r0, r10, #0x214 add r1, r5, #0x34 add r2, sp, #0x74 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x74 - bl func_01ff9cec + bl Vec3p_Length sub r0, r0, r11 str r0, [sp] add r0, sp, #0x74 @@ -10560,7 +10560,7 @@ _02185198: add r0, r5, #0x40 add r1, sp, #0x74 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add _02185200: ldr r0, _021854d8 ; =0x00000666 sub r11, r11, #0x1600 @@ -10589,15 +10589,15 @@ _02185214: add r0, r5, #0x40 add r1, sp, #0x68 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r5, #0x40 add r1, sp, #0x5c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, r5, #0x40 add r1, sp, #0x8c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #0x10] add r0, sp, #0x8c bl func_01fffbec @@ -10622,7 +10622,7 @@ _02185214: ldr r3, [r5, #0x44] sub r3, r3, #0x14 str r3, [r5, #0x44] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r10] cmp r1, #0 beq _02185304 @@ -10634,7 +10634,7 @@ _02185304: add r1, r6, #0x34 add r0, r4, #0x34 mov r2, r8 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r8 bl func_01fffb4c cmp r0, #0 @@ -10642,17 +10642,17 @@ _02185304: mov r0, r8 add r1, sp, #0x98 mov r2, r7 - bl func_01ff9c68 + bl Vec3p_Cross mov r0, r7 mov r1, r7 - bl func_01ff9d4c + bl Vec3p_Normalize mov r0, r7 mov r1, r8 add r2, sp, #0x98 - bl func_01ff9c68 + bl Vec3p_Cross add r0, sp, #0x98 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, sp, #0x98 add r1, r5, #0x10 mov r2, #0x24 @@ -10671,23 +10671,23 @@ _02185378: mov r0, r8 add r1, sp, #0x98 mov r2, r7 - bl func_01ff9c68 + bl Vec3p_Cross mov r0, r7 mov r1, r7 - bl func_01ff9d4c + bl Vec3p_Normalize b _021853e8 _021853bc: add r1, r6, #0x34 add r0, r5, #0x34 mov r2, r8 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r8 add r1, sp, #0x98 mov r2, r7 - bl func_01ff9c68 + bl Vec3p_Cross mov r0, r7 mov r1, r7 - bl func_01ff9d4c + bl Vec3p_Normalize _021853e8: mov r0, #0 str r0, [sp, #0x4c] @@ -10779,12 +10779,12 @@ func_ov38_021854e4: ; 0x021854e4 ldr r3, [r1, #8] add r1, r4, #0x214 str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0xc mov r1, #0xc00 bl func_01fffbec add r0, sp, #0xc - bl func_01ff9cec + bl Vec3p_Length mov r1, r0 cmp r1, #0x800 ble _0218556c @@ -10797,7 +10797,7 @@ _0218556c: add r0, r4, #0x214 add r1, sp, #0xc mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0x18 ldmia sp!, {r4, pc} arm_func_end func_ov38_021854e4 @@ -11419,12 +11419,12 @@ func_ov38_02185d38: ; 0x02185d38 add ip, r5, ip add r2, sp, #0 str ip, [r3, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r2, [sp, #0x20] ldr r3, [sp, #0x28] mov r0, r4 add r1, sp, #0 - bl func_01ff9e64 + bl Vec3p_Axpy add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, pc} arm_func_end func_ov38_02185d38 @@ -11704,7 +11704,7 @@ _02186194: add r1, sp, #0x5c mov r2, r0 str r3, [sp, #0x64] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02186a20 ; =gPlayerLink add r1, sp, #0x8c ldr r0, [r0] @@ -11729,7 +11729,7 @@ _02186268: add r1, sp, #0x50 mov r2, r0 str r3, [sp, #0x58] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02186a20 ; =gPlayerLink add r1, sp, #0x8c ldr r0, [r0] @@ -11924,7 +11924,7 @@ _021864f0: str r4, [r3, #0xf0] mov r4, #0 str r4, [r3, #0xf4] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02186a10 ; =data_ov38_021891e0 ldr r0, [r0, #0x110] cmp r0, #0 @@ -13443,12 +13443,12 @@ _02187b6c: str r3, [sp, #0x60] str r2, [sp, #0x64] str ip, [sp, #0x68] - bl func_01ff9c2c + bl Vec3p_Dot add r2, sp, #0x60 add r1, sp, #0x6c mov r3, r2 rsb r0, r0, #0 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [sp, #0x60] ldr r0, _02188068 ; =data_ov38_021891e0 mul r1, r4, r1 diff --git a/asm/ov39.inc b/asm/ov39.inc index 18dd77fe..f6caa703 100644 --- a/asm/ov39.inc +++ b/asm/ov39.inc @@ -106,10 +106,10 @@ .extern func_01ff8e84 .extern func_01ff9158 .extern func_01ff9958 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9cec -.extern func_01ff9d4c +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Length +.extern Vec3p_Normalize .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01fffbec diff --git a/asm/ov39.s b/asm/ov39.s index ecd9e4d5..5a08843b 100644 --- a/asm/ov39.s +++ b/asm/ov39.s @@ -1786,7 +1786,7 @@ func_ov39_0217d534: ; 0x0217d534 add r0, r4, #0x48 add r2, r4, #0x268 str r3, [r4, #0x1b0] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _0217d5cc ; =gActorManager ldr r2, _0217d5d0 ; =0x4e415649 ldr r1, [r1] @@ -2075,7 +2075,7 @@ _0217d950: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r5, #0x1b0] ldr r0, [r5, #0x4c] cmp r0, r1 @@ -2160,7 +2160,7 @@ _0217da40: ldr r3, [r5, #0x50] mov r2, r0 str r3, [sp, #0x44] - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #0x6c add r0, r5, #0x238 mov r2, #0x8000 @@ -2261,7 +2261,7 @@ _0217dbec: ldr r1, _0217dd18 ; =gPlayerPos add r2, sp, #0x60 add r0, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r2, [r5, #0x1e8] add r1, sp, #0x60 add r0, r5, #0x268 @@ -2274,7 +2274,7 @@ _0217dc74: ldr r0, _0217dd18 ; =gPlayerPos add r2, sp, #0x60 add r1, r5, #0x268 - bl func_01ff9bc4 + bl Vec3p_Add ldr r3, [sp, #0x60] ldr r1, [sp, #0x68] ldr r0, _0217dd0c ; =data_027e0f64 @@ -3043,7 +3043,7 @@ _0217e6dc: ldr r3, [r4, #0x50] mov r2, r6 str r3, [sp, #0x14] - bl func_01ff9bc4 + bl Vec3p_Add ldr r3, [r7, #0x20] ldr r2, [r7, #0x1c] ldr r1, [r7, #0x18] @@ -3062,11 +3062,11 @@ _0217e6dc: ldr r3, [r4, #0x50] mov r2, r5 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r6 mov r1, r5 add r2, sp, #0x24 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r11] mov r10, #0 mov r1, r5 @@ -3918,7 +3918,7 @@ func_ov39_0217f278: ; 0x0217f278 ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0xc] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0217f320 ; =data_027e0e58 add r2, sp, #0x10 ldr r0, [r0] @@ -4396,7 +4396,7 @@ _0217f868: mov r2, r3 ldr r3, [sp, #8] str r3, [r5, #0x68] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4, #0x284] ldr r0, [sp, #0xc] str r0, [r1, #0x48] @@ -4522,7 +4522,7 @@ func_ov39_0217faac: ; 0x0217faac ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add add r7, r4, #0x288 ldr r4, _0217fb44 ; =data_027e0e58 mov r6, #0 @@ -4568,7 +4568,7 @@ func_ov39_0217fb48: ; 0x0217fb48 ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _0217fbc4 ; =data_027e0e58 add r2, sp, #0xc ldr r0, [r0] @@ -5286,7 +5286,7 @@ _02180528: add r1, r5, #0x100 strh r0, [r1, #0x60] add r0, sp, #0x50 - bl func_01ff9cec + bl Vec3p_Length add sp, sp, #0x130 str r0, [r5, #0x1cc] ldmia sp!, {r4, r5, r6, pc} @@ -5690,7 +5690,7 @@ _02180bd0: ldr r1, _02180f74 ; =data_ov39_02186668 add r2, sp, #0x2c add r0, r5, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r5, #0x280] add r1, sp, #0x2c bl func_ov39_02185208 @@ -5703,7 +5703,7 @@ _02180c00: ldr r1, _02180f78 ; =data_ov39_02186674 add r2, sp, #0x2c add r0, r5, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, [r5, #0x1c0] add r0, sp, #0x38 add r1, sp, #0x2c @@ -5729,7 +5729,7 @@ _02180c64: ldr r1, _02180f78 ; =data_ov39_02186674 add r2, sp, #0x2c add r0, r5, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r5, #0x280] add r1, sp, #0x2c bl func_ov39_02185208 @@ -5742,7 +5742,7 @@ _02180c94: ldr r1, _02180f80 ; =data_ov39_02186680 add r2, sp, #0x2c add r0, r5, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, [r5, #0x1c0] add r0, sp, #0x38 add r1, sp, #0x2c @@ -5761,7 +5761,7 @@ _02180cdc: ldr r1, _02180f84 ; =data_ov39_0218668c add r2, sp, #0x2c add r0, r5, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add ldr r2, [r5, #0x1c0] add r0, sp, #0x38 add r1, sp, #0x2c @@ -5780,7 +5780,7 @@ _02180d24: ldr r1, _02180f84 ; =data_ov39_0218668c add r2, sp, #0x2c add r0, r5, #0x48 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r5, #0x280] add r1, sp, #0x2c bl func_ov39_02185208 @@ -6216,7 +6216,7 @@ _021812c0: ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -6718,7 +6718,7 @@ func_ov39_0218199c: ; 0x0218199c ldr r3, [r10, #0x27c] mov r2, r0 str r3, [sp, #0x14] - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #0x34 mov r0, r10 bl func_ov39_0217eaa0 @@ -6744,7 +6744,7 @@ func_ov39_0218199c: ; 0x0218199c ldr r3, [r10, #0x27c] mov r2, r0 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add add r1, sp, #0x34 mov r0, r10 bl func_ov39_0217eaa0 @@ -6956,7 +6956,7 @@ _02181d4c: ldr r3, [r5, #0x27c] mov r2, r0 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #0xc] ldr r0, [r5, #0x48] sub r0, r1, r0 @@ -7127,7 +7127,7 @@ _02181fd0: ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -7252,7 +7252,7 @@ func_ov39_021820f8: ; 0x021820f8 ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -7975,7 +7975,7 @@ _02182b08: ldr r3, [r5, #0x50] mov r2, r0 str r3, [sp, #0x1c] - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -8099,7 +8099,7 @@ _02182ccc: beq _02182d98 add r0, sp, #0x2c mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, sp, #0x2c mov r1, #0x1000 bl func_01fffbec @@ -8112,7 +8112,7 @@ _02182ccc: ldr r3, [r5, #0x68] mov r2, r0 str r3, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add _02182d98: add r1, sp, #0x2c mov r0, r5 @@ -8353,7 +8353,7 @@ func_ov39_021830d8: ; 0x021830d8 add r2, sp, #0 mov r1, r6 mov r4, r3 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r3, [r5] smull r2, r1, r0, r4 @@ -8406,7 +8406,7 @@ func_ov39_021830d8: ; 0x021830d8 mov r4, r4, lsr #0xc orr r4, r4, r3, lsl #20 str r4, [r5, #8] - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, pc} arm_func_end func_ov39_021830d8 @@ -9106,7 +9106,7 @@ func_ov39_021838c4: ; 0x021838c4 add r0, sp, #0 add r1, r4, #0x48 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #4] ldr r3, [sp] add r0, r0, #0x66 @@ -9317,7 +9317,7 @@ func_ov39_02183ccc: ; 0x02183ccc add r0, sp, #0x38 add r1, r7, #0x48 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [sp, #0x3c] ldr r3, [sp, #0x38] add r0, r0, #0x66 @@ -9513,7 +9513,7 @@ _02183f0c: ldr r3, [r7, #0x50] mov r2, r0 str r3, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add mov r1, r4 str r1, [sp] str r1, [sp, #4] @@ -10464,7 +10464,7 @@ _02184ec8: ldr r3, [r5, #0x50] add r2, sp, #0x18 str r3, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _021850ec ; =data_ov39_02186cc0 add r0, sp, #0x18 ldr r1, [r1, #0x2c] @@ -10802,7 +10802,7 @@ _02185374: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 bl _ZN5Actor20IncreaseActiveFramesEv mov r0, r4 @@ -10830,7 +10830,7 @@ _02185374: add r1, r1, #0x300 add r0, r4, #0x60 str r1, [sp, #4] - bl func_01ff9cec + bl Vec3p_Length add r1, r4, #0x200 ldrsh r3, [r1, #0x20] mov r1, #0x3000 @@ -11535,7 +11535,7 @@ func_ov39_02185c3c: ; 0x02185c3c add r1, sp, #0x28 add r2, sp, #0x1c add r0, r5, #0x208 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, _02185e8c ; =data_027e0fac ldr r0, [sp, #0x1c] ldrsh r4, [r1] diff --git a/asm/ov40.inc b/asm/ov40.inc index 670051c6..a835c1ea 100644 --- a/asm/ov40.inc +++ b/asm/ov40.inc @@ -130,8 +130,8 @@ .extern func_01ff98f0 .extern func_01ff9b4c .extern func_01ff9b88 -.extern func_01ff9bc4 -.extern func_01ff9bf8 +.extern Vec3p_Add +.extern Vec3p_Sub .extern func_01ffa8d4 .extern func_01ffbe34 .extern func_01fffcd8 diff --git a/asm/ov40.s b/asm/ov40.s index 55ab92fb..236df067 100644 --- a/asm/ov40.s +++ b/asm/ov40.s @@ -810,7 +810,7 @@ _0217c850: str r6, [sp, #0x2c] str r5, [sp, #0x30] str r3, [sp, #0x34] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x68 mov r5, #0 mov r3, #0x5000 @@ -819,7 +819,7 @@ _0217c850: str r6, [sp, #0x20] str r5, [sp, #0x24] str r3, [sp, #0x28] - bl func_01ff9bc4 + bl Vec3p_Add b _0217c8e4 _0217c8a0: add r0, sp, #0x74 @@ -830,7 +830,7 @@ _0217c8a0: str r5, [sp, #0x14] str r3, [sp, #0x18] str r5, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x68 mov r3, #0 add r1, sp, #8 @@ -838,7 +838,7 @@ _0217c8a0: str r5, [sp, #8] str r3, [sp, #0xc] str r5, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add _0217c8e4: add r0, sp, #0x74 add r6, sp, #0x50 @@ -970,7 +970,7 @@ _0217caac: str ip, [sp, #0x24] str r5, [sp, #0x28] str r3, [sp, #0x2c] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x48 mov ip, #0xa000 mov r5, #0 @@ -980,7 +980,7 @@ _0217caac: str ip, [sp, #0x18] str r5, [sp, #0x1c] str r3, [sp, #0x20] - bl func_01ff9bc4 + bl Vec3p_Add b _0217cb44 _0217cb00: add r0, sp, #0x54 @@ -991,7 +991,7 @@ _0217cb00: str r5, [sp, #0xc] str r3, [sp, #0x10] str r5, [sp, #0x14] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x48 mov r3, #0 add r1, sp, #0 @@ -999,7 +999,7 @@ _0217cb00: str r5, [sp] str r3, [sp, #4] str r5, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add _0217cb44: add r0, sp, #0x54 add r5, sp, #0x30 @@ -12247,7 +12247,7 @@ func_ov40_02185514: ; 0x02185514 str lr, [sp, #0x4c] str ip, [sp, #0x50] str ip, [r5, #0x804] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #1 strb r0, [r5, #0x7f8] add sp, sp, #0x78 diff --git a/asm/ov41.inc b/asm/ov41.inc index 516b304b..48edc350 100644 --- a/asm/ov41.inc +++ b/asm/ov41.inc @@ -109,9 +109,9 @@ .extern func_01ff8214 .extern func_01ff8e84 .extern func_01ff9158 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Axpy .extern func_01ffa0f4 .extern func_01fffcec .extern func_02018450 diff --git a/asm/ov41.s b/asm/ov41.s index a273bb3c..603a9055 100644 --- a/asm/ov41.s +++ b/asm/ov41.s @@ -776,7 +776,7 @@ func_ov41_02189ec4: ; 0x02189ec4 str r5, [sp, #0x14] str r3, [sp, #0x18] str r5, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x38 ldr r3, _0218a010 ; =0x00000ccd add r1, sp, #8 @@ -784,7 +784,7 @@ func_ov41_02189ec4: ; 0x02189ec4 str r5, [sp, #8] str r3, [sp, #0xc] str r5, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add mov ip, #0 bic r0, ip, #0x1f orr r3, r0, #7 @@ -4552,7 +4552,7 @@ func_ov41_0218cfa8: ; 0x0218cfa8 str r5, [sp, #0xc] str lr, [sp, #0x10] str ip, [sp, #0x14] - bl func_01ff9e64 + bl Vec3p_Axpy add r2, sp, #0 mov r1, r4 add r0, r4, #0x4f0 @@ -4588,7 +4588,7 @@ func_ov41_0218d020: ; 0x0218d020 str r5, [sp, #0xc] str lr, [sp, #0x10] str ip, [sp, #0x14] - bl func_01ff9e64 + bl Vec3p_Axpy add r2, sp, #0 mov r1, r4 add r0, r4, #0x4f0 @@ -4693,7 +4693,7 @@ _0218d19c: str lr, [sp] str ip, [sp, #4] str r4, [sp, #8] - bl func_01ff9e64 + bl Vec3p_Axpy ldr r2, _0218d208 ; =0x0000023d ldr r3, _0218d20c ; =0x0000071c add r1, sp, #0xc diff --git a/asm/ov43.inc b/asm/ov43.inc index de4189af..61919eea 100644 --- a/asm/ov43.inc +++ b/asm/ov43.inc @@ -77,9 +77,9 @@ .extern data_ov00_020e9370 .extern data_ov00_020eec9c .extern func_01ff9958 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Axpy .extern func_01ffa0f4 .extern func_01fffcec .extern func_01fffd04 diff --git a/asm/ov43.s b/asm/ov43.s index a0619673..80f80bdb 100644 --- a/asm/ov43.s +++ b/asm/ov43.s @@ -597,7 +597,7 @@ func_ov43_02189c8c: ; 0x02189c8c add r0, r7, #0x48 add r1, sp, #0xc add r2, sp, #0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -644,11 +644,11 @@ _02189d70: add r2, sp, #0xc mov r0, r4 mov r3, r1 - bl func_01ff9e64 + bl Vec3p_Axpy add r0, sp, #0 add r1, r7, #0x48 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 mov r3, #0 mov r1, r5 @@ -3141,7 +3141,7 @@ _0218bf54: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 bl func_ov00_020cc45c mov r0, r4 @@ -3636,7 +3636,7 @@ _0218c690: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 bl func_ov00_020cc45c mov r0, r4 @@ -3728,7 +3728,7 @@ _0218c7e8: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 bl func_ov00_020cc45c mov r0, r4 diff --git a/asm/ov44.inc b/asm/ov44.inc index b2f3d6ce..9a9a2958 100644 --- a/asm/ov44.inc +++ b/asm/ov44.inc @@ -81,9 +81,9 @@ .extern data_ov00_020e9370 .extern func_01ff8214 .extern func_01ff9958 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Axpy .extern func_01ffa0f4 .extern func_01fffcec .extern func_01fffd04 @@ -102,7 +102,7 @@ .extern func_0202e58c .extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev -.extern func_02042f74 +.extern abs .extern func_0204f614 .extern func_0204f754 .extern func_ov00_0207a1c8 diff --git a/asm/ov44.s b/asm/ov44.s index a1f8ccdd..09627821 100644 --- a/asm/ov44.s +++ b/asm/ov44.s @@ -1087,7 +1087,7 @@ _0218a26c: add r2, r4, #0x48 add r3, r5, #0x48 str ip, [sp, #4] - bl func_01ff9e64 + bl Vec3p_Axpy add sp, sp, #0xc ldmia sp!, {r4, r5, pc} .align 2, 0 @@ -1159,7 +1159,7 @@ _0218a348: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x74] bl func_0202bba8 strh r0, [r4, #0x78] @@ -1901,7 +1901,7 @@ _0218ac5c: add r1, sp, #0x30 add r2, sp, #0x24 add r0, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x24 mov r1, #0x800 mov r2, r0 @@ -1913,11 +1913,11 @@ _0218ac5c: add r0, sp, #0x24 add r1, sp, #0x30 add r2, sp, #0x18 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x18 add r2, sp, #0xc add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xc] str r0, [r4, #0x60] ldr r0, [sp, #0x14] @@ -1928,7 +1928,7 @@ _0218accc: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 mov r1, #0 ldr r5, [r4, #0x64] @@ -1971,7 +1971,7 @@ _0218ad78: add r2, sp, #0 add r0, r4, #0x164 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 ldr r1, _0218ae40 ; =0x0000019a mov r2, r0 @@ -1985,7 +1985,7 @@ _0218ad78: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4, #0x168] ldr r0, [r4, #0x4c] cmp r0, r1 @@ -2676,7 +2676,7 @@ func_ov44_0218b450: ; 0x0218b450 ldrsh ip, [r5, ip] str lr, [sp, #4] str ip, [sp, #0xc] - bl func_01ff9e64 + bl Vec3p_Axpy mov r0, #0 str r0, [sp] ldr r0, _0218b530 ; =data_027e0fe8 @@ -3964,7 +3964,7 @@ func_ov44_0218c4b8: ; 0x0218c4b8 strgt r0, [r5, #0x16c] add r0, r5, #0x48 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 mov r1, #0 bl func_01fffd04 @@ -3990,13 +3990,13 @@ _0218c56c: ldr r1, [r5, #0x48] ldr r0, [r5, #0x14] sub r0, r1, r0 - bl func_02042f74 + bl abs cmp r0, #0xa000 bge _0218c59c ldr r1, [r5, #0x50] ldr r0, [r5, #0x1c] sub r0, r1, r0 - bl func_02042f74 + bl abs cmp r0, #0xa000 blt _0218c5a8 _0218c59c: @@ -4506,7 +4506,7 @@ func_ov44_0218cac4: ; 0x0218cac4 add r2, sp, #0 add r0, r4, #0x14 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r2, [sp, #8] ldr ip, [sp] smull r1, r0, r2, r2 @@ -4633,7 +4633,7 @@ func_ov44_0218cc70: ; 0x0218cc70 add r0, sp, #0xc add r2, sp, #0 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -5492,7 +5492,7 @@ _0218d760: add r2, sp, #0xc add r0, r0, #0x48 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x14] cmp r0, #0 movgt r0, #2 @@ -5504,7 +5504,7 @@ _0218d78c: add r2, sp, #0 add r0, r0, #0x48 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] cmp r0, #0 movgt r0, #0 @@ -5543,7 +5543,7 @@ func_ov44_0218d7d8: ; 0x0218d7d8 add r2, sp, #0 add r0, r0, #0x48 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r4, #0x74] cmp r0, #3 addls pc, pc, r0, lsl #2 @@ -5594,7 +5594,7 @@ func_ov44_0218d87c: ; 0x0218d87c add r2, sp, #0 add r0, r0, #0x48 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp] ldr r1, [sp, #8] bl func_01ffa0f4 @@ -5724,7 +5724,7 @@ _0218d9fc: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldmia sp!, {r4, pc} .align 2, 0 _0218da24: .word 0x00000266 @@ -6518,7 +6518,7 @@ func_ov44_0218e3e0: ; 0x0218e3e0 str r5, [sp] str lr, [sp, #4] str ip, [sp, #8] - bl func_01ff9e64 + bl Vec3p_Axpy add r0, r4, #0x158 ldr r3, [r0] add r1, sp, #0x18 @@ -6726,7 +6726,7 @@ _0218e734: sub r0, ip, #0x1000 add r2, r2, #0x48 str ip, [sp, #4] - bl func_01ff9e64 + bl Vec3p_Axpy add sp, sp, #0xc ldmia sp!, {pc} arm_func_end func_ov44_0218e6b4 diff --git a/asm/ov46.inc b/asm/ov46.inc index 0f225e8c..a594f808 100644 --- a/asm/ov46.inc +++ b/asm/ov46.inc @@ -97,13 +97,13 @@ .extern func_01ff8214 .extern func_01ff8230 .extern func_01ff9958 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c2c -.extern func_01ff9c68 -.extern func_01ff9cec -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Dot +.extern Vec3p_Cross +.extern Vec3p_Length +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01fffb4c .extern func_01fffbec .extern func_01fffcd8 diff --git a/asm/ov46.s b/asm/ov46.s index 3d4c3a67..4dc2cbc5 100644 --- a/asm/ov46.s +++ b/asm/ov46.s @@ -1264,11 +1264,11 @@ _02190fec: add r0, r1, #0x1a8 add r1, r1, #0x19c add r2, r2, #0x400 - bl func_01ff9bf8 + bl Vec3p_Sub add r1, r5, #0x94 add r0, r1, #0x400 add r1, r1, #0x400 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, r5, #0x400 ldrsh r1, [r0, #0xcc] add r1, r1, #1 @@ -1286,11 +1286,11 @@ _02191048: add r0, r1, #0x1b4 add r1, r1, #0x1a8 add r2, r2, #0x400 - bl func_01ff9bf8 + bl Vec3p_Sub add r1, r5, #0x94 add r0, r1, #0x400 add r1, r1, #0x400 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, r5, #0x400 ldrsh r1, [r0, #0xcc] add r1, r1, #1 @@ -1362,10 +1362,10 @@ _02191128: add r2, r5, #0x4a0 add r0, r1, #0x1a8 add r1, r1, #0x19c - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r5, #0x4a0 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, r5, #0x400 ldrsh r1, [r0, #0xce] add r1, r1, #1 @@ -1385,10 +1385,10 @@ _021911b0: add r2, r5, #0x4a0 add r0, r1, #0x1c0 add r1, r1, #0x1a8 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, r5, #0x4a0 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize add r0, r5, #0x400 ldrsh r1, [r0, #0xce] add r1, r1, #1 @@ -1989,11 +1989,11 @@ func_ov46_0219194c: ; 0x0219194c ldr r0, _02191e30 ; =data_027e0160 mov r1, r6 mov r2, r4 - bl func_01ff9c68 + bl Vec3p_Cross mov r0, r6 mov r1, r4 mov r2, r5 - bl func_01ff9c68 + bl Vec3p_Cross ldr r0, [r7, #0x45c] ldr r2, [r4] ldr r1, [r4, #4] @@ -2108,11 +2108,11 @@ _02191b68: ldr r0, _02191e30 ; =data_027e0160 ldr r1, _02191e44 ; =data_ov46_02194c2c ldr r2, _02191e48 ; =data_ov46_02194c14 - bl func_01ff9c68 + bl Vec3p_Cross ldr r0, _02191e44 ; =data_ov46_02194c2c ldr r1, _02191e48 ; =data_ov46_02194c14 ldr r2, _02191e4c ; =data_ov46_02194c20 - bl func_01ff9c68 + bl Vec3p_Cross ldr r0, _02191e48 ; =data_ov46_02194c14 ldr r3, _02191e50 ; =0x0000059a ldr r8, [r0] @@ -3718,7 +3718,7 @@ func_ov46_021930a8: ; 0x021930a8 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x4c] cmp r0, #0x800 ldmgtia sp!, {r4, pc} @@ -4061,7 +4061,7 @@ func_ov46_02193574: ; 0x02193574 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r3, _02193b14 ; =0x0000019a ldr r1, [r4, #0x60] sub r2, r3, #0x334 @@ -4622,14 +4622,14 @@ _02193d6c: str r4, [sp, #0x10] str r3, [sp, #0x14] str r4, [sp, #0x18] - bl func_01ff9c68 + bl Vec3p_Cross add r0, sp, #0x28 mov r1, #0xcd bl func_01fffbec add r0, r5, #0x60 add r1, sp, #0x28 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x1c mov r1, #0x800 bl func_01fffbec @@ -4719,14 +4719,14 @@ _02193ec0: str ip, [sp, #0x10] str r3, [sp, #0x14] str ip, [sp, #0x18] - bl func_01ff9c68 + bl Vec3p_Cross ldr r1, _02193fa8 ; =0x00000333 add r0, sp, #0x28 bl func_01fffbec add r0, r4, #0x60 add r1, sp, #0x28 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x1c mov r1, #0x1000 bl func_01fffbec @@ -4793,11 +4793,11 @@ func_ov46_02194000: ; 0x02194000 add r2, sp, #0x18 add r0, r5, #0x48 add r1, r6, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r2, sp, #0xc add r0, r5, #0x60 add r1, r6, #0x60 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [sp, #0x18] ldr r3, [sp, #0x20] smull r0, r2, r1, r1 @@ -4840,23 +4840,23 @@ func_ov46_02194000: ; 0x02194000 _021940cc: add r0, sp, #0x18 add r1, sp, #0 - bl func_01ff9d4c + bl Vec3p_Normalize _021940d8: add r2, r6, #0x48 add r1, sp, #0 rsb r0, r4, #0 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy add r2, r5, #0x48 add r1, sp, #0 mov r0, r4 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy mov r2, #0 add r0, sp, #0 add r1, sp, #0xc str r2, [sp, #0x10] - bl func_01ff9c2c + bl Vec3p_Dot add r2, r6, #0x60 mov r4, #0xc00 mov ip, #0 @@ -4871,12 +4871,12 @@ _021940d8: add r1, sp, #0 mov r3, r2 mov r0, r4 - bl func_01ff9e64 + bl Vec3p_Axpy add r2, r5, #0x60 rsb r0, r4, #0 add r1, sp, #0 mov r3, r2 - bl func_01ff9e64 + bl Vec3p_Axpy add sp, sp, #0x24 ldmia sp!, {r4, r5, r6, r7, pc} arm_func_end func_ov46_02194000 @@ -4908,13 +4908,13 @@ _02194184: ldr r3, [r6, #0x50] mov r2, r4 str r3, [sp, #0x24] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #0 str r0, [sp, #0x14] ldr r1, [r6, #0x88] mov r0, r4 sub r8, r1, #0x29 - bl func_01ff9cec + bl Vec3p_Length mov r7, r0 cmp r7, r8 bge _021942d8 @@ -4953,7 +4953,7 @@ _02194264: add r1, r6, #0x48 mov r0, r4 mov r2, r1 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [sp, #0x10] mov r0, #0 mov r1, r1, lsl #0x14 diff --git a/asm/ov47.inc b/asm/ov47.inc index a66027ee..a82a6dc6 100644 --- a/asm/ov47.inc +++ b/asm/ov47.inc @@ -81,11 +81,11 @@ .extern func_01ff8214 .extern func_01ff8690 .extern func_01ff9158 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c2c -.extern func_01ff9cec -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Dot +.extern Vec3p_Length +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffbe78 diff --git a/asm/ov47.s b/asm/ov47.s index bc21cfd9..8ed604f6 100644 --- a/asm/ov47.s +++ b/asm/ov47.s @@ -347,7 +347,7 @@ func_ov47_02190380: ; 0x02190380 ldr r0, _0219053c ; =0xfffff666 mov r1, lr mov r2, r3 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [sp, #0x28] ldr r0, [sp, #0x2c] strh r1, [sp, #8] @@ -740,7 +740,7 @@ _02190964: str r3, [sp, #0x1c] ldr r3, [r4, #0x68] str r3, [sp, #0x20] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r8, #0x48] add r0, sp, #0x78 str r1, [sp, #0x78] @@ -756,7 +756,7 @@ _02190964: str r3, [sp, #0x10] ldr r3, [r8, #0x68] str r3, [sp, #0x14] - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x84 add r1, sp, #0x78 bl func_01ff9ec0 @@ -817,7 +817,7 @@ _02190ab8: mov r2, r0 str r5, [sp, #0x68] str r3, [sp, #0x64] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 mov r1, #0 bl func_01fffd04 @@ -837,7 +837,7 @@ _02190b14: str r1, [sp, #4] ldr r1, [r4, #0x68] str r1, [sp, #8] - bl func_01ff9cec + bl Vec3p_Length ldr r2, [r4, #0x178] ldr r1, _02190dec ; =0x00002ccc add r0, r2, r0 @@ -897,7 +897,7 @@ _02190bf8: add r0, r4, #0x48 add r1, sp, #0x60 mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r3, [r4, #0xcc] ldr r2, [r4, #0xc4] mov r1, #0 @@ -914,7 +914,7 @@ _02190bf8: bl func_01fffb4c add r0, sp, #0x54 add r1, sp, #0x48 - bl func_01ff9c2c + bl Vec3p_Dot ldr r1, _02190df0 ; =0xfffff266 cmp r0, r1 bge _02190c88 @@ -931,7 +931,7 @@ _02190bf8: _02190c88: add r0, sp, #0x54 add r1, sp, #0x60 - bl func_01ff9c2c + bl Vec3p_Dot add r1, sp, #0x54 mov r5, r0 add r3, sp, #0x3c @@ -947,7 +947,7 @@ _02190c88: mov r0, r3 mov r2, r3 add r1, sp, #0x3c - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x30 bl func_01fffb4c ldr ip, _02190df4 ; =data_027e0764 @@ -4645,7 +4645,7 @@ func_ov47_02193dec: ; 0x02193dec add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 mov r1, #0 bl func_01fffd04 diff --git a/asm/ov48.inc b/asm/ov48.inc index 02a79d17..cf870256 100644 --- a/asm/ov48.inc +++ b/asm/ov48.inc @@ -146,11 +146,11 @@ .extern func_01ff81f8 .extern func_01ff8214 .extern func_01ff992c -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9c68 -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Cross +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ffa0f4 .extern func_01ffbf5c .extern func_01fffcec diff --git a/asm/ov48.s b/asm/ov48.s index 717fb4df..0c9085fd 100644 --- a/asm/ov48.s +++ b/asm/ov48.s @@ -773,7 +773,7 @@ func_ov48_021908ac: ; 0x021908ac ldr r0, _0219093c ; =gPlayerPos add r2, sp, #0x10 add r1, r5, #0x54 - bl func_01ff9bf8 + bl Vec3p_Sub add r1, sp, #0 mov r0, r5 bl _ZN5Actor9GetHitboxEP8Cylinder @@ -1859,7 +1859,7 @@ func_ov48_02191478: ; 0x02191478 str ip, [sp, #0x84] str r7, [sp, #0x88] str r6, [sp, #0x8c] - bl func_01ff9e64 + bl Vec3p_Axpy ldrsh r1, [r5, #0x78] add r0, sp, #0x90 sub r3, sp, #8 @@ -1979,7 +1979,7 @@ _02191694: str r5, [sp, #0x4c] str r0, [sp, #0x48] ldr r0, [r4, #0x518] - bl func_01ff9e64 + bl Vec3p_Axpy ldr r3, _02191c14 ; =data_ov48_0219542c ldr r1, [sp, #0x48] ldr r0, [r3, #0x2c] @@ -2071,7 +2071,7 @@ _021918a4: add r1, sp, #0x5c add r3, sp, #0x38 add r2, r4, #0x48 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r0, _02191c38 ; =gPlayer ldr r3, _02191c2c ; =0x00000333 ldr r0, [r0] @@ -2116,13 +2116,13 @@ _02191984: add r1, sp, #0x5c add r3, sp, #0x38 add r2, r4, #0x48 - bl func_01ff9e64 + bl Vec3p_Axpy cmp r5, #0 bne _021919dc add r0, sp, #0x78 add r2, sp, #0x50 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x50 str r0, [sp] ldrb r0, [r4, #0x124] @@ -2769,7 +2769,7 @@ func_ov48_02192060: ; 0x02192060 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r4 bl func_ov00_020cc3fc mov r0, r4 @@ -3012,7 +3012,7 @@ func_ov48_02192354: ; 0x02192354 str r5, [sp] str lr, [sp, #4] str ip, [sp, #8] - bl func_01ff9e64 + bl Vec3p_Axpy add r0, r4, #0x138 ldr r2, _021923e0 ; =0x0000013f ldr r3, _021923e4 ; =0x0000071c @@ -3132,7 +3132,7 @@ _021924c0: add r2, sp, #0x18 add r0, r0, #0x400 add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [r4, #0x4ac] add r0, r4, #0xc4 str r1, [r5, #0x48] @@ -3150,7 +3150,7 @@ _021924c0: str r1, [r5, #0x68] ldr r5, [r4, #0x530] add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r1, [r4, #0x4c4] add r0, r4, #0xdc str r1, [r5, #0x48] @@ -3168,7 +3168,7 @@ _021924c0: str r1, [r5, #0x68] ldr r5, [r4, #0x534] add r1, r5, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [r4, #0x4dc] str r0, [r5, #0x48] ldr r0, [r4, #0x4e0] @@ -3574,7 +3574,7 @@ _02192b5c: add r0, sp, #0x6c add r2, sp, #0x38 add r1, r8, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, _02193170 ; =gPlayer ldrb r1, [r9, #0x124] ldr r0, [r0] @@ -3632,12 +3632,12 @@ _02192c34: mov r0, r6 mov r1, r7 mov r2, r5 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r11 mov r1, r5 mov r2, r7 mov r3, r6 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [r9, #0x340] ldr r0, [r9, #0x338] add r0, r1, r0 @@ -3723,7 +3723,7 @@ _02192da4: mov r2, r4 add r0, r10, #0x400 add r1, r9, #0x4d0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #8] cmp r0, #0 ldreq r0, [sp, #0x10] @@ -3731,7 +3731,7 @@ _02192da4: beq _02192e18 mov r0, r4 mov r1, r4 - bl func_01ff9d4c + bl Vec3p_Normalize b _02192e18 _02192de0: add r1, r8, #1 @@ -3739,7 +3739,7 @@ _02192de0: mla r0, r1, r0, r11 mov r1, r6 mov r2, r4 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #8] cmp r0, #0 ldreq r0, [sp, #0x10] @@ -3747,13 +3747,13 @@ _02192de0: beq _02192e18 mov r0, r4 mov r1, r4 - bl func_01ff9d4c + bl Vec3p_Normalize _02192e18: mov r0, r5 mov r1, r4 mov r2, r6 mov r3, r7 - bl func_01ff9e64 + bl Vec3p_Axpy add r0, r8, #1 mov r0, r0, lsl #0x10 mov r8, r0, asr #0x10 @@ -4051,7 +4051,7 @@ _02193240: bne _021932c4 mov r1, r9 add r2, sp, #0x54 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x54] ldr r1, [sp, #0x5c] bl func_01ffa0f4 @@ -4080,7 +4080,7 @@ _02193240: _021932c4: mov r1, r9 add r2, sp, #0x24 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x24] ldr r1, [sp, #0x2c] bl func_01ffa0f4 @@ -4549,7 +4549,7 @@ _02193758: mov r3, r5 mov r0, r0, lsl #0xb add r2, r10, #0x48 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [sp, #0xb0] ldr r0, [r11] add r1, r1, #0x800 @@ -4588,7 +4588,7 @@ _021937e8: mov r3, r5 rsb r0, r0, #0 add r2, r10, #0x48 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [sp, #0xb0] ldr r0, [r11] add r1, r1, #0x800 @@ -5594,10 +5594,10 @@ func_ov48_0219451c: ; 0x0219451c mov r0, r2 add r2, sp, #0x24 mov r4, r1 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x24 add r1, sp, #0 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r1, [sp] ldr r6, [sp, #8] rsb r2, r1, #0 @@ -5607,11 +5607,11 @@ func_ov48_0219451c: ; 0x0219451c str r6, [sp, #0x18] str r3, [sp, #0x1c] str r2, [sp, #0x20] - bl func_01ff9d4c + bl Vec3p_Normalize add r0, sp, #0 add r1, sp, #0x18 add r2, sp, #0xc - bl func_01ff9c68 + bl Vec3p_Cross ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] str r0, [sp, #0x34] diff --git a/asm/ov49.inc b/asm/ov49.inc index abad862e..a0cb1521 100644 --- a/asm/ov49.inc +++ b/asm/ov49.inc @@ -95,7 +95,7 @@ .extern func_01ff8214 .extern func_01ff8690 .extern func_01ff9158 -.extern func_01ff9bc4 +.extern Vec3p_Add .extern func_01ff9ec0 .extern func_01fffbec .extern func_01fffcd8 diff --git a/asm/ov49.s b/asm/ov49.s index 46691bb4..765d2064 100644 --- a/asm/ov49.s +++ b/asm/ov49.s @@ -414,7 +414,7 @@ func_ov49_02195930: ; 0x02195930 ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0x18] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r4, #0x48] add r0, sp, #0x40 str r1, [sp, #4] @@ -424,7 +424,7 @@ func_ov49_02195930: ; 0x02195930 ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #0xc] - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x4c add ip, sp, #0x28 ldmia r0, {r0, r1, r2} @@ -1628,7 +1628,7 @@ _02196ac0: ldr r3, [r5, #0x50] mov r2, r0 str r3, [sp, #0x24] - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [sp] ldr r3, [r5, #8] @@ -1663,7 +1663,7 @@ _02196ac0: add r0, sp, #0x70 add r1, sp, #0x64 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02196fec ; =gPlayerLink ldr r0, [r0] bl func_ov00_020bc46c @@ -1879,7 +1879,7 @@ _02196e94: ldr r3, [r5, #0x50] mov r2, r0 str r3, [sp, #0x18] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, [r5, #0x48] add r0, sp, #0x4c str r1, [sp, #4] @@ -1889,7 +1889,7 @@ _02196e94: ldr r3, [r5, #0x50] mov r2, r0 str r3, [sp, #0xc] - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x58 add r4, sp, #0x34 ldmia r0, {r0, r1, r2} @@ -2154,7 +2154,7 @@ _0219725c: ldr r3, [r4, #0x50] mov r2, r0 str r3, [sp, #8] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4, #0x130] cmp r0, #6 beq _021972f8 @@ -2643,7 +2643,7 @@ _021978a8: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, r5 mov r1, #0 ldr r4, [r5, #0x64] diff --git a/asm/ov50.inc b/asm/ov50.inc index 1c5fbdd3..695d3d8e 100644 --- a/asm/ov50.inc +++ b/asm/ov50.inc @@ -95,11 +95,11 @@ .extern func_01ff8214 .extern func_01ff8230 .extern func_01ff8690 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9cec -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Length +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_01ffec34 diff --git a/asm/ov50.s b/asm/ov50.s index f6f4d661..8b498597 100644 --- a/asm/ov50.s +++ b/asm/ov50.s @@ -266,7 +266,7 @@ func_ov50_021957b4: ; 0x021957b4 str r5, [sp, #0x14] str r3, [sp, #0x18] str r5, [sp, #0x1c] - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0x38 mov r3, #0x1000 add r1, sp, #8 @@ -274,7 +274,7 @@ func_ov50_021957b4: ; 0x021957b4 str r3, [sp, #0xc] str r5, [sp, #8] str r5, [sp, #0x10] - bl func_01ff9bc4 + bl Vec3p_Add add r0, sp, #0x44 add r5, sp, #0x20 ldmia r0, {r0, r1, r2} @@ -365,7 +365,7 @@ _021959c8: add r0, r6, #0x48 add r1, r6, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02195ca8 ; =data_ov50_021989d0 add r1, sp, #0x20 str r0, [sp, #0x20] @@ -724,7 +724,7 @@ _02195eb0: str r2, [sp, #0x24] str r1, [sp, #0x28] str r3, [sp, #0x2c] - bl func_01ff9cec + bl Vec3p_Length movs r4, r0 addeq sp, sp, #0x3c ldmeqia sp!, {r3, r4, r5, r6, pc} @@ -1207,10 +1207,10 @@ func_ov50_02196508: ; 0x02196508 str r3, [sp] str ip, [sp, #4] str lr, [sp, #8] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r5 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r1, _021965b0 ; =0x0000030a mov r0, r5 bl func_01fffbec @@ -1331,7 +1331,7 @@ func_ov50_02196698: ; 0x02196698 str ip, [sp, #0x18] str r3, [sp, #0x1c] str ip, [sp, #0x20] - bl func_01ff9bf8 + bl Vec3p_Sub mov ip, #0x800 add r0, sp, #0x3c mov r3, #0x1000 @@ -1340,7 +1340,7 @@ func_ov50_02196698: ; 0x02196698 str ip, [sp, #0xc] str r3, [sp, #0x10] str ip, [sp, #0x14] - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, _0219683c ; =gMapManager add r0, sp, #8 ldr r1, [r1] @@ -2256,7 +2256,7 @@ _0219729c: ldr r0, _02197450 ; =0xfffff829 mov r1, lr mov r2, r3 - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [sp, #0x2c] ldr r0, [sp, #0x30] strh r1, [sp, #8] @@ -2712,12 +2712,12 @@ func_ov50_021978fc: ; 0x021978fc add r2, sp, #0 mov r0, r3 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r2, r4, #0x60 add r1, sp, #0 mov r3, r2 mov r0, #0x1d - bl func_01ff9e64 + bl Vec3p_Axpy add r0, r4, #0x60 ldr r2, _021979ac ; =0x00000333 mov r1, #0 @@ -2798,12 +2798,12 @@ func_ov50_02197a00: ; 0x02197a00 add r2, sp, #0 mov r0, r3 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub add r2, r4, #0x60 add r1, sp, #0 mov r3, r2 mov r0, #0x29 - bl func_01ff9e64 + bl Vec3p_Axpy add r0, r4, #0x60 ldr r2, _02197ad4 ; =0x00000199 mov r1, #0 @@ -3248,7 +3248,7 @@ _02197ff8: ldr r0, _0219857c ; =gPlayerPos add r2, sp, #0x2c add r1, r4, #0x54 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x2c] ldr r1, [sp, #0x34] bl func_01ffa0f4 diff --git a/asm/ov51.inc b/asm/ov51.inc index 6f270961..1dd38451 100644 --- a/asm/ov51.inc +++ b/asm/ov51.inc @@ -80,10 +80,10 @@ .extern func_01ff8214 .extern func_01ff8690 .extern func_01ff9958 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9d4c -.extern func_01ff9e64 +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Normalize +.extern Vec3p_Axpy .extern func_01ffa0f4 .extern func_01ffe1cc .extern func_01fffcec diff --git a/asm/ov51.s b/asm/ov51.s index e4e85a86..8dea6c30 100644 --- a/asm/ov51.s +++ b/asm/ov51.s @@ -500,7 +500,7 @@ func_ov51_02195b00: ; 0x02195b00 mov r0, r3 add r1, r5, #0x48 add r2, r5, #0x60 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 str r1, [r5, #0x64] ldr r0, [r5, #0x60] @@ -515,7 +515,7 @@ func_ov51_02195b00: ; 0x02195b00 _02195b60: add r0, r5, #0x60 mov r1, r0 - bl func_01ff9d4c + bl Vec3p_Normalize ldr r2, [r5, #0x60] ldr r0, _02195c04 ; =0x0000011f mov r1, #0 @@ -628,7 +628,7 @@ func_ov51_02195c80: ; 0x02195c80 add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _02195e98 ; =gActorManager add r1, r5, #0x34 ldr r0, [r0] @@ -1198,7 +1198,7 @@ _021963d4: mov r2, r6 str r3, [sp, #0xc] str r11, [sp, #0x10] - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, #5 str r0, [sp] ldrb r3, [r10, #0x124] @@ -1514,7 +1514,7 @@ func_ov51_021967e8: ; 0x021967e8 mov r0, r1 add r2, sp, #0x18 add r1, r6, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] bl func_01ffa0f4 @@ -1962,7 +1962,7 @@ func_ov51_02196dc4: ; 0x02196dc4 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldmia sp!, {r4, pc} arm_func_end func_ov51_02196dc4 @@ -2225,7 +2225,7 @@ func_ov51_021970a0: ; 0x021970a0 add r2, sp, #0x14 add r0, r6, #0x48 add r1, r7, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r2, [sp, #0x1c] ldr ip, [sp, #0x14] smull r1, r0, r2, r2 @@ -3056,7 +3056,7 @@ _02197c48: add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [sp] ldr r3, [r4, #8] @@ -3280,7 +3280,7 @@ _02197f48: mov r1, r6 mov r2, r7 mov r3, r7 - bl func_01ff9e64 + bl Vec3p_Axpy add r0, r4, #0x158 ldr ip, [r0] mov r1, r11 @@ -3304,7 +3304,7 @@ _02197f94: mov r2, r3 sub r0, r0, #1 mov r0, r0, lsl #0xb - bl func_01ff9e64 + bl Vec3p_Axpy ldr r1, [sp, #0x40] ldr r0, _0219801c ; =0x000004cd sub r1, r1, #0xd7 @@ -3464,7 +3464,7 @@ func_ov51_02198184: ; 0x02198184 add r1, sp, #0 add r0, sp, #0xc mov r2, r1 - bl func_01ff9bf8 + bl Vec3p_Sub mov r1, #0 str r1, [sp, #4] ldr r0, [r4, #0x74] diff --git a/asm/ov52.inc b/asm/ov52.inc index 5a9e8ad6..1e1284da 100644 --- a/asm/ov52.inc +++ b/asm/ov52.inc @@ -93,8 +93,8 @@ .extern data_ov09_0211f5b4 .extern func_01ff80d4 .extern func_01ff8214 -.extern func_01ff9bc4 -.extern func_01ff9cec +.extern Vec3p_Add +.extern Vec3p_Length .extern func_01ffbe34 .extern func_020078f4 .extern func_020196bc diff --git a/asm/ov52.s b/asm/ov52.s index a5a49c92..23aef35d 100644 --- a/asm/ov52.s +++ b/asm/ov52.s @@ -1483,7 +1483,7 @@ _021967ec: mov r0, r5 bl func_ov52_0219699c ldr r0, _021968a8 ; =data_027e0fa0 - bl func_01ff9cec + bl Vec3p_Length ldr r1, _021968ac ; =0x0000019a cmp r0, r1 ble _0219682c @@ -1568,7 +1568,7 @@ func_ov52_021968c4: ; 0x021968c4 add r0, r4, #0x48 add r1, r4, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add add sp, sp, #0xc ldmia sp!, {r3, r4, pc} arm_func_end func_ov52_021968c4 diff --git a/asm/ov53.inc b/asm/ov53.inc index feed70cb..7fcce18a 100644 --- a/asm/ov53.inc +++ b/asm/ov53.inc @@ -29,8 +29,8 @@ .extern data_027e0ffc .extern data_ov00_020ee6f8 .extern data_ov14_02155cfc -.extern func_01ff9bc4 -.extern func_01ff9bf8 +.extern Vec3p_Add +.extern Vec3p_Sub .extern func_01ff9ec0 .extern func_01ffa9fc .extern func_01ffbe78 diff --git a/asm/ov53.s b/asm/ov53.s index 9917a07b..e6c250d4 100644 --- a/asm/ov53.s +++ b/asm/ov53.s @@ -757,7 +757,7 @@ _02199518: mov r1, ip mov r2, ip str r3, [sp, #0x34] - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, _021996f0 ; =gActorManager ldr r1, _021996f4 ; =data_ov53_0219a180 add r2, sp, #0x28 @@ -911,7 +911,7 @@ _02199850: ldr r1, _02199a08 ; =gPlayerPos add r2, sp, #0x2c add r0, r5, #0x44 - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -985,7 +985,7 @@ _02199938: add r0, sp, #0x20 ldr r1, _02199a08 ; =gPlayerPos mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r4 str r0, [sp] add r0, r5, #0x44 @@ -996,7 +996,7 @@ _02199938: ldr r1, _02199a08 ; =gPlayerPos add r0, r5, #0x44 add r2, sp, #0x14 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [sp] str r0, [sp, #4] diff --git a/asm/ov54.inc b/asm/ov54.inc index 0c55f21e..59b8a2d7 100644 --- a/asm/ov54.inc +++ b/asm/ov54.inc @@ -38,8 +38,8 @@ .extern gActorManager .extern data_ov00_020eec9c .extern func_01ff8230 -.extern func_01ff9bc4 -.extern func_01ff9cec +.extern Vec3p_Add +.extern Vec3p_Length .extern func_01ff9ec0 .extern func_01ffa9fc .extern func_01fffcec diff --git a/asm/ov54.s b/asm/ov54.s index 3c06934e..4c0fc526 100644 --- a/asm/ov54.s +++ b/asm/ov54.s @@ -275,7 +275,7 @@ _02198fcc: add r0, sp, #0x24 sub r1, r2, r1 str r1, [sp, #0x2c] - bl func_01ff9cec + bl Vec3p_Length ldr r1, _02199294 ; =0x00000333 cmp r0, r1 movle r6, #1 @@ -758,7 +758,7 @@ _021996f8: mov r1, r0 add r0, sp, #0x1c mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [sp] str r0, [sp, #4] diff --git a/asm/ov55.inc b/asm/ov55.inc index 053d6f0f..fbdcd401 100644 --- a/asm/ov55.inc +++ b/asm/ov55.inc @@ -35,7 +35,7 @@ .extern data_027e103c .extern data_ov00_020eec68 .extern data_ov00_020eec9c -.extern func_01ff9bc4 +.extern Vec3p_Add .extern func_01ffa9fc .extern func_01fffcec .extern func_02019570 diff --git a/asm/ov55.s b/asm/ov55.s index fde6b8eb..0bec5e08 100644 --- a/asm/ov55.s +++ b/asm/ov55.s @@ -310,7 +310,7 @@ _0219907c: mov r1, r0 add r0, sp, #8 add r2, r4, #0x38 - bl func_01ff9bc4 + bl Vec3p_Add bl func_020385b8 add r1, r4, #0x38 bl _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p @@ -331,7 +331,7 @@ _021990dc: mov r1, r0 add r0, sp, #8 add r2, r4, #0x38 - bl func_01ff9bc4 + bl Vec3p_Add bl func_020385b8 add r1, r4, #0x38 bl _ZN17LinkStateInteract14SetThrowOffsetEP5Vec3p diff --git a/asm/ov56.inc b/asm/ov56.inc index f47d5b06..d590e55c 100644 --- a/asm/ov56.inc +++ b/asm/ov56.inc @@ -17,7 +17,7 @@ .extern data_027e0fb8 .extern data_027e0fe8 .extern data_027e0ffc -.extern func_01ff9bc4 +.extern Vec3p_Add .extern func_01ffa9fc .extern func_01fffcd8 .extern func_01fffcec diff --git a/asm/ov56.s b/asm/ov56.s index 65885ac9..d0a14acb 100644 --- a/asm/ov56.s +++ b/asm/ov56.s @@ -428,7 +428,7 @@ _0219925c: ldr r1, _021992e0 ; =gPlayerPos add r2, sp, #8 add r0, r4, #0x44 - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 str r1, [sp] str r1, [sp, #4] diff --git a/asm/ov57.inc b/asm/ov57.inc index 3b6843fe..37e3e765 100644 --- a/asm/ov57.inc +++ b/asm/ov57.inc @@ -42,9 +42,9 @@ .extern data_ov00_020eec9c .extern data_ov14_02155df8 .extern func_01ff8aa0 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9cec +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Length .extern func_01ff9ec0 .extern func_01ffa9fc .extern func_01ffbe78 diff --git a/asm/ov57.s b/asm/ov57.s index bcfac6ad..4d0257f8 100644 --- a/asm/ov57.s +++ b/asm/ov57.s @@ -12,9 +12,9 @@ func_ov57_02198d00: ; 0x02198d00 add r2, sp, #0 mov r5, r0 mov r4, r1 - bl func_01ff9bf8 + bl Vec3p_Sub add r0, sp, #0 - bl func_01ff9cec + bl Vec3p_Length mov r1, r0 cmp r1, r6 addle sp, sp, #0xc @@ -791,9 +791,9 @@ func_ov57_021996b0: ; 0x021996b0 mov r1, r5 mov r2, r5 add r0, r4, #0x18 - bl func_01ff9bf8 + bl Vec3p_Sub mov r0, r5 - bl func_01ff9cec + bl Vec3p_Length ldr r3, [r4, #0x74] ldr r1, _02199740 ; =0x000006e1 mov r2, #0 @@ -994,7 +994,7 @@ _02199920: add r0, sp, #0x68 add r2, sp, #0x5c add r1, r5, #0x78 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, _02199ac4 ; =data_027e03c8 mov r0, #0x17 mov r2, #0xc @@ -1012,7 +1012,7 @@ _021999e4: add r1, sp, #0x68 add r2, sp, #0x2c add r0, r5, #0x78 - bl func_01ff9bc4 + bl Vec3p_Add mov r2, #0 add r0, sp, #8 add r1, r5, #0x78 @@ -1574,7 +1574,7 @@ _0219a180: ldr r1, _0219a200 ; =gPlayerPos add r2, sp, #8 add r0, r5, #0x44 - bl func_01ff9bc4 + bl Vec3p_Add mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -1967,7 +1967,7 @@ func_ov57_0219a6b8: ; 0x0219a6b8 add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add mov r0, #0 str r0, [sp] ldr r3, [r5, #8] @@ -2132,7 +2132,7 @@ _0219a918: add r0, r5, #0x48 add r1, r5, #0x60 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add _0219a938: mov r0, #0 str r0, [sp] diff --git a/asm/ov58.inc b/asm/ov58.inc index 9a5878c2..5d16c2a6 100644 --- a/asm/ov58.inc +++ b/asm/ov58.inc @@ -36,10 +36,10 @@ .extern data_ov00_020ee6f8 .extern data_ov00_020eec9c .extern data_ov14_02155fb0 -.extern func_01ff9bc4 -.extern func_01ff9bf8 -.extern func_01ff9cec -.extern func_01ff9d4c +.extern Vec3p_Add +.extern Vec3p_Sub +.extern Vec3p_Length +.extern Vec3p_Normalize .extern func_01ffbe34 .extern func_01ffbe78 .extern func_01ffbf5c diff --git a/asm/ov58.s b/asm/ov58.s index 99be0ad4..3949a996 100644 --- a/asm/ov58.s +++ b/asm/ov58.s @@ -77,7 +77,7 @@ func_ov58_02198d00: ; 0x02198d00 str ip, [sp, #8] str r3, [sp, #0xc] str r2, [sp, #0x10] - bl func_01ff9d4c + bl Vec3p_Normalize mov r1, #0x400 add r0, sp, #8 rsb r1, r1, #0 @@ -85,7 +85,7 @@ func_ov58_02198d00: ; 0x02198d00 add r0, sp, #0x14 add r1, sp, #8 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr r1, _02198ef0 ; =gMapManager add r0, sp, #4 ldr r6, [r1] @@ -352,9 +352,9 @@ _021990b6: str r0, [r3] add r0, r2, #0 add r1, #0x20 - blx func_01ff9bf8 + blx Vec3p_Sub add r0, sp, #0 - blx func_01ff9cec + blx Vec3p_Length add r4, r0, #0 ldr r0, _02199168 ; =0x00000333 cmp r4, r0 @@ -390,7 +390,7 @@ _0219912a: add r0, #0x20 add r1, sp, #0 add r2, r0, #0 - blx func_01ff9bc4 + blx Vec3p_Add b _02199144 _02199138: ldr r0, [r5, #0x2c] @@ -969,12 +969,12 @@ _02199606: str r0, [sp, #0x118] add r0, sp, #0x188 add r2, r0, #0 - blx func_01ff9bf8 + blx Vec3p_Sub ldr r7, [sp, #0x18c] mov r0, #0 str r0, [sp, #0x18c] add r0, sp, #0x188 - blx func_01ff9cec + blx Vec3p_Length str r0, [sp, #0x20] mov r0, #0 str r0, [sp, #0x1c] @@ -1447,7 +1447,7 @@ _021999d2: str r0, [sp, #0xc4] add r0, sp, #0x164 add r2, r0, #0 - blx func_01ff9bf8 + blx Vec3p_Sub ldr r0, [sp, #0x16c] cmp r0, #0 bge _021999fa @@ -1479,7 +1479,7 @@ _02199a10: str r0, [sp, #0x178] add r0, sp, #0x170 add r2, r0, #0 - blx func_01ff9bc4 + blx Vec3p_Add b _02199a38 _02199a30: add sp, #0x1fc @@ -2053,7 +2053,7 @@ _02199e8a: str r0, [sp, #0x13c] add r0, sp, #0x134 add r2, r0, #0 - blx func_01ff9bf8 + blx Vec3p_Sub ldr r2, [sp, #0x1b4] ldr r1, [sp, #0x1b8] ldr r0, [sp, #0x1b0] @@ -2121,7 +2121,7 @@ _02199f40: mov r0, r5 mov r1, r6 mov r2, r5 - bl func_01ff9bc4 + bl Vec3p_Add cmp r8, #0 ldr r0, [r4] mov r2, #0 @@ -2239,7 +2239,7 @@ _0219a0d8: mov r1, r5 str r2, [r10, #8] mov r2, r10 - bl func_01ff9bc4 + bl Vec3p_Add ldr r0, [r4] mov r1, r10 mov r2, r11 diff --git a/asm/ov59.inc b/asm/ov59.inc index f453c175..fca11f34 100644 --- a/asm/ov59.inc +++ b/asm/ov59.inc @@ -32,8 +32,8 @@ .extern data_ov00_020e9370 .extern func_01ff8214 .extern func_01ff88b0 -.extern func_01ff9bc4 -.extern func_01ff9bf8 +.extern Vec3p_Add +.extern Vec3p_Sub .extern func_01ffa0f4 .extern func_01ffbf5c .extern func_01fffcd8 diff --git a/asm/ov59.s b/asm/ov59.s index d2fbb52d..3e6bf592 100644 --- a/asm/ov59.s +++ b/asm/ov59.s @@ -291,7 +291,7 @@ func_ov59_02198ffc: ; 0x02198ffc add r0, sp, #0xc str r2, [sp, #8] mov r2, r0 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xc] ldr r1, [sp, #0x14] bl func_01ffa0f4 @@ -558,7 +558,7 @@ _021993b4: add r0, sp, #0xb0 add r2, sp, #0xa4 add r1, r4, #0x48 - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0xa4] ldr r1, [sp, #0xac] bl func_01ffa0f4 @@ -589,7 +589,7 @@ _02199408: ldr r1, _0219a070 ; =gPlayerPos add r0, sp, #0x98 add r2, sp, #0x8c - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x8c] ldr r1, [sp, #0x94] bl func_01ffa0f4 @@ -896,7 +896,7 @@ _021998b8: str r3, [sp, #0x78] ldr r3, [r5, #0xc4] str r3, [sp, #0x7c] - bl func_01ff9bf8 + bl Vec3p_Sub ldr r0, [sp, #0x68] ldr r1, [sp, #0x70] bl func_01ffa0f4 @@ -2111,7 +2111,7 @@ func_ov59_0219aa08: ; 0x0219aa08 add r0, r5, #0x334 add r1, sp, #0x54 mov r2, r0 - bl func_01ff9bc4 + bl Vec3p_Add ldr lr, [r5, #0x344] ldr r2, [r5, #0x338] ldr r3, _0219aba0 ; =0x00000333 diff --git a/include/lib/math.h b/include/lib/math.h index a8951eb4..a39974cc 100644 --- a/include/lib/math.h +++ b/include/lib/math.h @@ -32,6 +32,14 @@ typedef struct { /* c */ } Vec3p; +extern "C" void Vec3p_Add(Vec3p *a, Vec3p *b, Vec3p *out); +extern "C" void Vec3p_Sub(Vec3p *a, Vec3p *b, Vec3p *out); +extern "C" q20 Vec3p_Dot(Vec3p *a, Vec3p *b); +extern "C" void Vec3p_Cross(Vec3p *a, Vec3p *b, Vec3p *out); +extern "C" q20 Vec3p_Length(Vec3p *a); +extern "C" void Vec3p_Normalize(Vec3p *vec, Vec3p *out); +extern "C" void Vec3p_Axpy(q20 a, Vec3p *x, Vec3p *y, Vec3p *out); + typedef struct { /* 00 */ q20 x; /* 04 */ q20 y; diff --git a/libs/c/include/stdlib.h b/libs/c/include/stdlib.h new file mode 100644 index 00000000..0f078d8a --- /dev/null +++ b/libs/c/include/stdlib.h @@ -0,0 +1,6 @@ +#ifndef _C_STRLIB_H +#define _C_STRLIB_H + +int abs(int n); + +#endif