summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/rom3.s14
-rw-r--r--asm/rom5.s476
-rw-r--r--asm/rom_803D1FC.s89
-rw-r--r--asm/rom_8040EB4.s18
-rw-r--r--asm/rom_8074BAC.s18
-rw-r--r--ld_script.txt1
-rw-r--r--src/trig.c35
7 files changed, 300 insertions, 351 deletions
diff --git a/asm/rom3.s b/asm/rom3.s
index 1f0a120c6..9110fa90c 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -5153,7 +5153,7 @@ _0800E03C:
beq _0800E0A4
ldr r4, _0800E090
ldrh r0, [r6, 0xA]
- bl sine2
+ bl Sin2
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -5168,7 +5168,7 @@ _0800E056:
strh r0, [r4]
ldr r4, _0800E094
ldrh r0, [r6, 0xC]
- bl sine2
+ bl Sin2
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -5197,7 +5197,7 @@ _0800E0A0: .4byte 0x03004280
_0800E0A4:
ldr r4, _0800E134
ldrh r0, [r6, 0xA]
- bl sine2
+ bl Sin2
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -5212,7 +5212,7 @@ _0800E0B6:
strh r0, [r4]
ldr r4, _0800E138
ldrh r0, [r6, 0xA]
- bl cosine2
+ bl Cos2
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -5224,7 +5224,7 @@ _0800E0D4:
strh r0, [r4]
ldr r4, _0800E13C
ldrh r0, [r6, 0xC]
- bl sine2
+ bl Sin2
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -5239,7 +5239,7 @@ _0800E0EC:
strh r0, [r4]
ldr r4, _0800E140
ldrh r0, [r6, 0xC]
- bl cosine2
+ bl Cos2
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -10076,7 +10076,7 @@ _080107C8:
_080107CC:
movs r2, 0x32
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
ldr r2, _080107F8
lsls r1, r5, 4
adds r1, r5
diff --git a/asm/rom5.s b/asm/rom5.s
index 2135ab199..71ce6d1aa 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -1367,12 +1367,12 @@ sub_807B8A4: @ 807B8A4
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x20
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x8
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -24752,12 +24752,12 @@ sub_8086B98: @ 8086B98
movs r0, 0xC
ldrsh r1, [r5, r0]
movs r0, 0x84
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r0, 0xC
ldrsh r1, [r5, r0]
movs r0, 0x94
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r5, 0xE]
adds r0, 0x1
@@ -24792,12 +24792,12 @@ sub_8086BE4: @ 8086BE4
movs r0, 0xC
ldrsh r1, [r5, r0]
movs r0, 0x7C
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r0, 0xC
ldrsh r1, [r5, r0]
movs r0, 0x76
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r5, 0xE]
adds r0, 0x1
@@ -24986,12 +24986,12 @@ sub_8086D70: @ 8086D70
movs r0, 0xA
ldrsh r1, [r5, r0]
movs r0, 0x84
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r0, 0xA
ldrsh r1, [r5, r0]
movs r0, 0x94
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r5, 0x8]
adds r0, 0x1
@@ -25019,12 +25019,12 @@ sub_8086DB0: @ 8086DB0
movs r0, 0xA
ldrsh r1, [r4, r0]
movs r0, 0x84
- bl cosine
+ bl Cos
strh r0, [r5, 0x24]
movs r0, 0xA
ldrsh r1, [r4, r0]
movs r0, 0x94
- bl sine
+ bl Sin
strh r0, [r5, 0x26]
ldrh r0, [r4, 0xC]
adds r0, 0x1
@@ -25069,12 +25069,12 @@ sub_8086E10: @ 8086E10
movs r0, 0xA
ldrsh r1, [r5, r0]
movs r0, 0x7C
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r0, 0xA
ldrsh r1, [r5, r0]
movs r0, 0x76
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r5, 0x8]
adds r0, 0x1
@@ -25102,12 +25102,12 @@ sub_8086E50: @ 8086E50
movs r0, 0xA
ldrsh r1, [r4, r0]
movs r0, 0x7C
- bl cosine
+ bl Cos
strh r0, [r5, 0x24]
movs r0, 0xA
ldrsh r1, [r4, r0]
movs r0, 0x76
- bl sine
+ bl Sin
strh r0, [r5, 0x26]
ldrh r0, [r4, 0xC]
adds r0, 0x1
@@ -28894,13 +28894,13 @@ sub_8088BC4: @ 8088BC4
movs r1, 0x32
ldrsh r0, [r4, r1]
movs r1, 0x8C
- bl cosine
+ bl Cos
movs r5, 0
strh r0, [r4, 0x24]
movs r2, 0x32
ldrsh r0, [r4, r2]
movs r1, 0x48
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
adds r0, 0x4
@@ -29501,12 +29501,12 @@ _0808905C:
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x78
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x78
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r2, [r4, 0x32]
movs r0, 0x32
@@ -29558,13 +29558,13 @@ sub_80890D8: @ 80890D8
movs r1, 0x32
ldrsh r0, [r4, r1]
movs r1, 0x8C
- bl cosine
+ bl Cos
movs r5, 0
strh r0, [r4, 0x24]
movs r2, 0x32
ldrsh r0, [r4, r2]
movs r1, 0x48
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
adds r0, 0x4
@@ -29665,12 +29665,12 @@ _08089196:
movs r3, 0x30
ldrsh r0, [r4, r3]
movs r1, 0x20
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x78
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r1, [r4, 0x32]
movs r2, 0x32
@@ -81203,13 +81203,13 @@ objc_8097BBC: @ 80A2A5C
ldrsh r0, [r4, r1]
movs r2, 0x2E
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x32
ldrsh r0, [r4, r1]
movs r2, 0x2E
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
adds r0, 0x8
@@ -92776,7 +92776,7 @@ sub_80A8488: @ 80A8488
ldrsh r0, [r5, r1]
movs r2, 0xA
ldrsh r1, [r5, r2]
- bl sine
+ bl Sin
ldr r2, _080A84FC
lsls r1, r4, 4
adds r1, r4
@@ -92787,7 +92787,7 @@ sub_80A8488: @ 80A8488
ldrsh r0, [r5, r1]
movs r2, 0xC
ldrsh r1, [r5, r2]
- bl cosine
+ bl Cos
negs r0, r0
strh r0, [r4, 0x26]
ldrh r1, [r5, 0xC]
@@ -93452,7 +93452,7 @@ sub_80A89B4: @ 80A89B4
lsrs r0, 8
movs r2, 0xC
ldrsh r1, [r5, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r5, 0x16]
ldrh r1, [r5, 0x1C]
@@ -93758,7 +93758,7 @@ sub_80A8C0C: @ 80A8C0C
mov r0, r8
movs r2, 0xA
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
lsls r0, 16
lsrs r5, r0, 16
mov r9, r5
@@ -121856,7 +121856,7 @@ sub_80B6680: @ 80B6680
movs r1, 0xA
ldrsh r0, [r4, r1]
movs r1, 0x28
- bl sine
+ bl Sin
ldr r5, _080B66E8
ldrb r1, [r5, 0xC]
lsls r1, 2
@@ -121868,7 +121868,7 @@ sub_80B6680: @ 80B6680
movs r1, 0xFF
ands r0, r1
movs r1, 0x28
- bl sine
+ bl Sin
ldrb r1, [r5, 0xD]
lsls r1, 2
add r1, sp
@@ -121912,7 +121912,7 @@ sub_80B66EC: @ 80B66EC
movs r1, 0xA
ldrsh r0, [r4, r1]
movs r1, 0x28
- bl sine
+ bl Sin
ldr r5, _080B6754
ldrb r1, [r5, 0xC]
lsls r1, 2
@@ -121924,7 +121924,7 @@ sub_80B66EC: @ 80B66EC
movs r1, 0xFF
ands r0, r1
movs r1, 0x28
- bl sine
+ bl Sin
ldrb r1, [r5, 0xD]
lsls r1, 2
add r1, sp
@@ -149364,7 +149364,7 @@ sub_80C3DF0: @ 80C3DF0
asrs r0, 24
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
ldrh r1, [r4, 0x32]
ldrh r0, [r4, 0x36]
@@ -163033,7 +163033,7 @@ sub_80CA768: @ 80CA768
ldrsh r0, [r4, r1]
movs r2, 0x34
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x36]
ldrh r1, [r4, 0x38]
@@ -163206,14 +163206,14 @@ _080CA8EE:
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0x5
- bl sine
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0xE
- bl cosine
+ bl Cos
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -163447,7 +163447,7 @@ _080CAAE2:
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0xC
- bl cosine
+ bl Cos
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -163632,13 +163632,13 @@ sub_80CAC44: @ 80CAC44
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x20
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x3
negs r1, r1
- bl cosine
+ bl Cos
ldrh r1, [r4, 0x32]
adds r1, 0x18
strh r1, [r4, 0x32]
@@ -163816,7 +163816,7 @@ sub_80CADA8: @ 80CADA8
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0x20
- bl sine
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
@@ -163824,7 +163824,7 @@ sub_80CADA8: @ 80CADA8
ldrsh r0, [r4, r1]
movs r1, 0x5
negs r1, r1
- bl cosine
+ bl Cos
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -163918,7 +163918,7 @@ sub_80CAE74: @ 80CAE74
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0x8
- bl sine
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
@@ -164055,7 +164055,7 @@ sub_80CAF6C: @ 80CAF6C
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x19
- bl sine
+ bl Sin
negs r0, r0
b _080CAF9A
.align 2, 0
@@ -164064,7 +164064,7 @@ _080CAF90:
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x19
- bl sine
+ bl Sin
_080CAF9A:
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x2E]
@@ -164374,12 +164374,12 @@ _080CB1E0:
ldrsh r0, [r4, r1]
movs r2, 0x34
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r5, 0x38
ldrsh r0, [r4, r5]
movs r1, 0x5
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
movs r1, 0x38
ldrsh r0, [r4, r1]
@@ -165122,7 +165122,7 @@ _080CB7A8:
ands r0, r1
movs r2, 0x32
ldrsh r1, [r6, r2]
- bl sine
+ bl Sin
strh r0, [r6, 0x26]
movs r0, 0x2E
ldrsh r1, [r6, r0]
@@ -165314,7 +165314,7 @@ _080CB912:
subs r1, r2
lsls r1, 16
asrs r1, 16
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
adds r0, r4, 0
bl sub_80CB814
@@ -165425,7 +165425,7 @@ _080CB9EE:
subs r1, r2
lsls r1, 16
asrs r1, 16
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
adds r0, r4, 0
bl sub_80CB814
@@ -165634,7 +165634,7 @@ _080CBB8A:
subs r1, r2
lsls r1, 16
asrs r1, 16
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
lsls r0, 16
cmp r0, 0
@@ -165721,12 +165721,12 @@ _080CBC3A:
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x3C
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x14
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldr r0, _080CBC78
str r0, [r4, 0x1C]
@@ -165900,12 +165900,12 @@ _080CBD92:
movs r6, 0x30
ldrsh r0, [r4, r6]
movs r1, 0x3C
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x14
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
_080CBDAA:
pop {r4-r6}
@@ -167871,12 +167871,12 @@ sub_80CCCB4: @ 80CCCB4
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x64
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r2, 0x2E
ldrsh r0, [r4, r2]
movs r1, 0x14
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -168682,7 +168682,7 @@ sub_80CD2D4: @ 80CD2D4
lsls r0, 18
asrs r0, 16
movs r1, 0x3
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x30]
adds r0, 0x1
@@ -171726,7 +171726,7 @@ _080CE9B8:
ldrsh r0, [r5, r1]
movs r2, 0x36
ldrsh r1, [r5, r2]
- bl sine
+ bl Sin
strh r0, [r5, 0x24]
_080CE9FA:
pop {r4,r5}
@@ -172049,7 +172049,7 @@ _080CEC38:
lsls r0, 16
asrs r0, 16
movs r1, 0xF
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r2, [r4, 0x22]
ldrh r0, [r4, 0x20]
@@ -172223,12 +172223,12 @@ sub_80CED78: @ 80CED78
movs r1, 0x32
ldrsh r0, [r4, r1]
movs r1, 0x12
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r2, 0x32
ldrsh r0, [r4, r2]
movs r1, 0x12
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
movs r1, 0x32
ldrsh r0, [r4, r1]
@@ -172385,7 +172385,7 @@ sub_80CEEE8: @ 80CEEE8
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0x8
- bl sine
+ bl Sin
lsls r0, 16
lsrs r1, r0, 16
ldrh r2, [r4, 0x24]
@@ -172404,7 +172404,7 @@ _080CEF14:
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0x4
- bl sine
+ bl Sin
ldrh r3, [r4, 0x26]
adds r0, r3
strh r0, [r4, 0x26]
@@ -174541,7 +174541,7 @@ _080CFF8C:
ldrsh r0, [r4, r1]
movs r2, 0x32
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
adds r0, 0x5
@@ -174702,7 +174702,7 @@ _080D00D2:
ldrsh r0, [r4, r1]
movs r2, 0x3A
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
adds r0, 0x8
@@ -178319,7 +178319,7 @@ _080D1C9A:
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x8
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
ldrh r2, [r4, 0x32]
lsls r0, r2, 16
@@ -178707,7 +178707,7 @@ sub_80D1FA4: @ 80D1FA4
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0xE
- bl sine
+ bl Sin
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -178757,7 +178757,7 @@ _080D2000:
ldrsh r0, [r4, r1]
movs r2, 0x32
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x34]
adds r0, 0x3
@@ -178836,7 +178836,7 @@ sub_80D2094: @ 80D2094
movs r1, 0x34
ldrsh r0, [r4, r1]
movs r1, 0x4
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x34]
adds r0, 0x3
@@ -179647,14 +179647,14 @@ _080D271E:
ldrh r1, [r4, 0x32]
lsls r1, 16
asrs r1, 24
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r2, 0x30
ldrsh r0, [r4, r2]
ldrh r1, [r4, 0x34]
lsls r1, 16
asrs r1, 24
- bl cosine
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
adds r0, 0x9
@@ -179755,12 +179755,12 @@ sub_80D27E0: @ 80D27E0
movs r1, 0
ldrsh r0, [r4, r1]
movs r1, 0xA
- bl sine
+ bl Sin
strh r0, [r5, 0x2E]
movs r1, 0
ldrsh r0, [r4, r1]
movs r1, 0x7
- bl cosine
+ bl Cos
strh r0, [r5, 0x30]
ldr r0, _080D2830
str r0, [r5, 0x1C]
@@ -179863,12 +179863,12 @@ sub_80D28AC: @ 80D28AC
movs r1, 0
ldrsh r0, [r4, r1]
movs r1, 0xA
- bl sine
+ bl Sin
strh r0, [r5, 0x2E]
movs r1, 0
ldrsh r0, [r4, r1]
movs r1, 0x7
- bl cosine
+ bl Cos
strh r0, [r5, 0x30]
ldrh r0, [r4, 0x2]
strh r0, [r5, 0x32]
@@ -179945,7 +179945,7 @@ _080D2956:
ands r5, r0
adds r0, r5, 0
movs r1, 0x50
- bl sine
+ bl Sin
lsls r0, 16
asrs r0, 24
strh r0, [r4, 0x24]
@@ -179955,7 +179955,7 @@ _080D2956:
bgt _080D299A
adds r0, r5, 0
movs r1, 0x50
- bl cosine
+ bl Cos
movs r2, 0x2E
ldrsh r1, [r4, r2]
lsrs r2, r1, 31
@@ -180004,7 +180004,7 @@ sub_80D29CC: @ 80D29CC
movs r1, 0x34
ldrsh r0, [r4, r1]
movs r1, 0x5
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x38
ldrsh r0, [r4, r1]
@@ -180083,7 +180083,7 @@ _080D2A5C:
ldrsh r0, [r4, r1]
movs r2, 0x32
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
adds r2, r0, 0
strh r2, [r4, 0x26]
ldrh r0, [r4, 0x34]
@@ -180182,7 +180182,7 @@ _080D2B2C:
movs r1, 0x1E
subs r1, r0
adds r0, r2, 0
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r0, 0x30
ldrsh r2, [r4, r0]
@@ -180196,7 +180196,7 @@ _080D2B48:
movs r1, 0xA
subs r1, r0
adds r0, r2, 0
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
movs r2, 0x30
ldrsh r0, [r4, r2]
@@ -180707,16 +180707,16 @@ _080D2EF6:
ands r4, r2
adds r0, r4, 0
movs r1, 0x64
- bl cosine
+ bl Cos
strh r0, [r6, 0x24]
adds r0, r4, 0
movs r1, 0xA
- bl sine
+ bl Sin
adds r4, r0, 0
movs r1, 0x3A
ldrsh r0, [r6, r1]
movs r1, 0x4
- bl cosine
+ bl Cos
ldrh r2, [r6, 0x30]
adds r4, r2
adds r0, r4
@@ -181143,14 +181143,14 @@ _080D3240:
ldrb r0, [r5, 0x8]
movs r2, 0x4
ldrsh r1, [r5, r2]
- bl sine
+ bl Sin
ldrh r1, [r6, 0x20]
subs r1, r0
strh r1, [r6, 0x20]
ldrb r0, [r5, 0x8]
movs r2, 0x6
ldrsh r1, [r5, r2]
- bl cosine
+ bl Cos
ldrh r1, [r6, 0x22]
subs r1, r0
strh r1, [r6, 0x22]
@@ -181215,14 +181215,14 @@ sub_80D32E8: @ 80D32E8
movs r0, 0x2E
ldrsh r1, [r7, r0]
adds r0, r6, 0
- bl sine
+ bl Sin
ldrh r1, [r5, 0x24]
adds r0, r1
strh r0, [r5, 0x24]
movs r0, 0x30
ldrsh r1, [r7, r0]
adds r0, r6, 0
- bl cosine
+ bl Cos
ldrh r1, [r5, 0x26]
adds r0, r1
strh r0, [r5, 0x26]
@@ -181582,7 +181582,7 @@ _080D35F0:
asrs r0, 24
movs r2, 0x3C
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -181918,7 +181918,7 @@ sub_80D3874: @ 80D3874
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x4
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x30]
adds r0, 0x30
@@ -183479,11 +183479,11 @@ _080D4482:
asrs r4, r6, 16
adds r0, r4, 0
movs r1, 0x40
- bl cosine
+ bl Cos
strh r0, [r5, 0x36]
adds r0, r4, 0
movs r1, 0x40
- bl sine
+ bl Sin
strh r0, [r5, 0x38]
mov r1, sp
ldrh r1, [r1]
@@ -184459,7 +184459,7 @@ sub_80D4C18: @ 80D4C18
ldrsh r0, [r4, r1]
movs r2, 0x32
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x34]
subs r0, 0x1
@@ -185086,7 +185086,7 @@ _080D5106:
adds r1, r2
lsls r1, 16
asrs r1, 16
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -185097,7 +185097,7 @@ _080D5106:
adds r1, r2
lsls r1, 16
asrs r1, 16
- bl cosine
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
ldrh r2, [r4, 0x2E]
@@ -185329,14 +185329,14 @@ _080D52F4:
movs r1, 0x3C
ldrsh r0, [r6, r1]
movs r1, 0x1C
- bl sine
+ bl Sin
ldrh r1, [r6, 0x24]
adds r0, r1
strh r0, [r6, 0x24]
movs r1, 0x3C
ldrsh r0, [r6, r1]
movs r1, 0x1C
- bl cosine
+ bl Cos
ldrh r1, [r6, 0x26]
adds r0, r1
strh r0, [r6, 0x26]
@@ -185378,12 +185378,12 @@ sub_80D5348: @ 80D5348
movs r1, 0x3C
ldrsh r0, [r4, r1]
movs r1, 0x1C
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x3C
ldrsh r0, [r4, r1]
movs r1, 0x1C
- bl cosine
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x3C]
adds r0, 0x14
@@ -185491,14 +185491,14 @@ sub_80D541C: @ 80D541C
ldrh r1, [r4, 0x32]
lsls r1, 16
asrs r1, 24
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
ldrh r1, [r4, 0x32]
lsls r1, 16
asrs r1, 24
- bl cosine
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
adds r0, 0xA
@@ -186483,7 +186483,7 @@ _080D5BAA:
ldrsh r0, [r5, r2]
movs r2, 0x36
ldrsh r1, [r5, r2]
- bl sine
+ bl Sin
strh r0, [r5, 0x24]
ldrh r0, [r5, 0x32]
adds r0, 0x4
@@ -186509,7 +186509,7 @@ _080D5BDE:
ldrsh r0, [r5, r1]
movs r2, 0x36
ldrsh r1, [r5, r2]
- bl sine
+ bl Sin
adds r2, r0, 0
movs r3, 0
strh r2, [r5, 0x24]
@@ -186577,7 +186577,7 @@ sub_80D5C5C: @ 80D5C5C
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0x10
- bl sine
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
@@ -186646,14 +186646,14 @@ _080D5CD8:
ldrsh r0, [r4, r2]
lsls r1, 16
asrs r1, 24
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
ldrh r1, [r4, 0x36]
lsls r1, 16
asrs r1, 24
- bl cosine
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
adds r2, r0, 0x7
@@ -187721,7 +187721,7 @@ sub_80D6514: @ 80D6514
ldrsh r0, [r4, r1]
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
@@ -187729,7 +187729,7 @@ sub_80D6514: @ 80D6514
ldrsh r0, [r4, r2]
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -187982,13 +187982,13 @@ sub_80D672C: @ 80D672C
ldrsh r0, [r4, r1]
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x3C
ldrsh r0, [r4, r1]
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x3A]
ldrh r1, [r4, 0x3C]
@@ -190275,7 +190275,7 @@ sub_80D7888: @ 80D7888
ldrsh r0, [r4, r1]
movs r2, 0x34
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
@@ -190283,7 +190283,7 @@ sub_80D7888: @ 80D7888
ldrsh r0, [r4, r2]
movs r2, 0x34
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -190678,12 +190678,12 @@ _080D7BD0:
ldrsh r0, [r4, r2]
lsls r1, 16
asrs r1, 16
- bl sine
+ bl Sin
strh r0, [r4, 0x34]
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0xF
- bl cosine
+ bl Cos
strh r0, [r4, 0x36]
strh r5, [r4, 0x38]
ldr r1, _080D7C04
@@ -190720,14 +190720,14 @@ _080D7C1E:
ldrsh r0, [r4, r2]
lsls r1, 16
asrs r1, 16
- bl sine
+ bl Sin
ldrh r1, [r4, 0x34]
subs r0, r1
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0xF
- bl cosine
+ bl Cos
ldrh r1, [r4, 0x36]
subs r0, r1
strh r0, [r4, 0x26]
@@ -190983,7 +190983,7 @@ _080D7E2C:
ldrsh r0, [r4, r2]
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -191267,7 +191267,7 @@ sub_80D8048: @ 80D8048
ldrsh r0, [r4, r1]
movs r2, 0x3A
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
@@ -191275,7 +191275,7 @@ sub_80D8048: @ 80D8048
ldrsh r0, [r4, r2]
movs r1, 0x6
negs r1, r1
- bl cosine
+ bl Cos
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -193767,7 +193767,7 @@ sub_80D9404: @ 80D9404
asrs r0, 24
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -193950,7 +193950,7 @@ _080D956C:
ldrsh r0, [r4, r1]
movs r2, 0x32
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x34]
adds r0, 0x3
@@ -194838,7 +194838,7 @@ sub_80D9C40: @ 80D9C40
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x2
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x2E]
adds r0, 0x1
@@ -195305,7 +195305,7 @@ sub_80D9FF0: @ 80D9FF0
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x4
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x30]
adds r0, 0x30
@@ -195358,12 +195358,12 @@ sub_80DA05C: @ 80DA05C
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x20
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x8
- bl cosine
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
adds r0, 0x5
@@ -197544,13 +197544,13 @@ sub_80DB0E8: @ 80DB0E8
movs r5, 0xD
negs r5, r5
adds r1, r5, 0
- bl sine
+ bl Sin
ldr r4, _080DB188
strh r0, [r4]
movs r1, 0x8
ldrsh r0, [r7, r1]
adds r1, r5, 0
- bl cosine
+ bl Cos
strh r0, [r4, 0x2]
movs r0, 0x1
strh r0, [r4, 0x4]
@@ -200814,7 +200814,7 @@ _080DCA4E:
ldrsh r0, [r4, r1]
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
@@ -201574,7 +201574,7 @@ sub_80DD02C: @ 80DD02C
ldrsh r0, [r4, r2]
movs r2, 0x34
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x32]
ldrh r1, [r4, 0x38]
@@ -202834,7 +202834,7 @@ sub_80DD9FC: @ 80DD9FC
ldrsh r0, [r4, r2]
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
ldrh r1, [r4, 0x26]
subs r1, r0
strh r1, [r4, 0x26]
@@ -202970,7 +202970,7 @@ _080DDB1C:
movs r2, 0xA
ldrsh r1, [r4, r2]
movs r0, 0x4
- bl cosine
+ bl Cos
ldrh r4, [r4, 0xC]
adds r0, r4
strh r0, [r6]
@@ -203066,14 +203066,14 @@ _080DDBF8:
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0xA
- bl sine
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0xF
- bl cosine
+ bl Cos
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -203117,14 +203117,14 @@ sub_80DDC4C: @ 80DDC4C
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0xA
- bl sine
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0xF
- bl cosine
+ bl Cos
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -203275,12 +203275,12 @@ sub_80DDD78: @ 80DDD78
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x20
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x8
- bl cosine
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x2E]
subs r0, 0x41
@@ -205732,7 +205732,7 @@ sub_80DF0B8: @ 80DF0B8
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0xC
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
ldr r0, _080DF120
ldrb r0, [r0]
@@ -206160,7 +206160,7 @@ _080DF3EE:
ldrsh r0, [r4, r2]
movs r2, 0x34
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x32]
subs r0, 0x41
@@ -206213,7 +206213,7 @@ _080DF444:
movs r2, 0x3A
ldrsh r0, [r4, r2]
movs r1, 0x7
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldr r2, _080DF498
movs r0, 0x2E
@@ -206298,7 +206298,7 @@ sub_80DF4F4: @ 80DF4F4
ldrsh r0, [r5, r2]
movs r2, 0x30
ldrsh r1, [r5, r2]
- bl sine
+ bl Sin
ldr r4, _080DF554
movs r1, 0x38
ldrsh r2, [r5, r1]
@@ -206311,7 +206311,7 @@ sub_80DF4F4: @ 80DF4F4
ldrsh r0, [r5, r2]
movs r2, 0x30
ldrsh r1, [r5, r2]
- bl cosine
+ bl Cos
movs r1, 0x38
ldrsh r2, [r5, r1]
lsls r1, r2, 4
@@ -206658,13 +206658,13 @@ _080DF7EE:
ldrsh r0, [r6, r1]
movs r2, 0x3C
ldrsh r1, [r6, r2]
- bl cosine
+ bl Cos
strh r0, [r6, 0x24]
movs r1, 0x3A
ldrsh r0, [r6, r1]
movs r2, 0x3C
ldrsh r1, [r6, r2]
- bl sine
+ bl Sin
strh r0, [r6, 0x26]
ldr r0, _080DF818
str r0, [r6, 0x1C]
@@ -206697,13 +206697,13 @@ _080DF82E:
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x36]
adds r0, 0x1
@@ -206766,13 +206766,13 @@ _080DF8C2:
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x36]
adds r0, 0x1
@@ -207108,14 +207108,14 @@ sub_80DFB28: @ 80DFB28
ldrsh r0, [r5, r1]
movs r2, 0x4
ldrsh r1, [r5, r2]
- bl cosine
+ bl Cos
strh r0, [r4, 0x30]
movs r3, 0x2
ldrsh r0, [r5, r3]
lsls r6, 16
asrs r6, 16
adds r1, r6, 0
- bl sine
+ bl Sin
strh r0, [r4, 0x32]
ldrh r1, [r4, 0x30]
ldrh r2, [r5]
@@ -207540,7 +207540,7 @@ _080DFED2:
ldrsh r0, [r4, r1]
movs r2, 0x3A
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
ldrh r6, [r4, 0x26]
adds r0, r6
strh r0, [r4, 0x26]
@@ -211417,12 +211417,12 @@ sub_80E1D20: @ 80E1D20
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x1E
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r2, 0x2E
ldrsh r0, [r4, r2]
movs r1, 0xA
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x2E]
cmp r0, 0x7F
@@ -216818,7 +216818,7 @@ _080E4714:
bne _080E4778
ldr r7, _080E4754
ldrh r0, [r4, 0x14]
- bl cosine2
+ bl Cos2
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -285427,12 +285427,12 @@ sub_810594C: @ 810594C
movs r1, 0x2E
ldrsh r0, [r5, r1]
movs r1, 0x14
- bl cosine
+ bl Cos
strh r0, [r5, 0x24]
movs r2, 0x2E
ldrsh r0, [r5, r2]
movs r1, 0x6
- bl sine
+ bl Sin
strh r0, [r5, 0x26]
adds r1, r5, 0
adds r1, 0x43
@@ -286620,7 +286620,7 @@ _081061EA:
ldrsh r0, [r0, r2]
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x3A
ldrsh r0, [r4, r1]
@@ -286630,7 +286630,7 @@ _081061EA:
ldrsh r0, [r0, r2]
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r1, [r4, 0x30]
movs r2, 0x30
@@ -295578,7 +295578,7 @@ sub_810A62C: @ 810A62C
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x8
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
lsls r0, 24
@@ -296873,7 +296873,7 @@ sub_810B05C: @ 810B05C
ldrh r4, [r0, 0x8]
adds r7, r4, 0
adds r0, r4, 0
- bl sine2
+ bl Sin2
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -296883,7 +296883,7 @@ _0810B084:
lsls r0, 12
lsrs r5, r0, 16
adds r0, r4, 0
- bl cosine2
+ bl Cos2
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -296953,7 +296953,7 @@ sub_810B0F4: @ 810B0F4
ldrh r4, [r0, 0xA]
adds r7, r4, 0
adds r0, r4, 0
- bl sine2
+ bl Sin2
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -296963,7 +296963,7 @@ _0810B11C:
lsls r0, 12
lsrs r5, r0, 16
adds r0, r4, 0
- bl cosine2
+ bl Cos2
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -297073,7 +297073,7 @@ _0810B1EA:
strh r0, [r4, 0x30]
_0810B1EC:
ldrh r0, [r4, 0x30]
- bl cosine2
+ bl Cos2
lsls r0, 16
asrs r0, 16
lsls r1, r0, 4
@@ -297087,7 +297087,7 @@ _0810B204:
asrs r0, 12
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x30]
- bl sine2
+ bl Sin2
lsls r0, 16
asrs r0, 16
lsls r1, r0, 4
@@ -297162,7 +297162,7 @@ _0810B28E:
strh r0, [r4, 0x30]
_0810B290:
ldrh r0, [r4, 0x30]
- bl cosine2
+ bl Cos2
lsls r0, 16
asrs r0, 16
lsls r1, r0, 4
@@ -297176,7 +297176,7 @@ _0810B2A8:
asrs r0, 12
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x30]
- bl sine2
+ bl Sin2
lsls r0, 16
asrs r0, 16
lsls r1, r0, 4
@@ -317634,11 +317634,11 @@ sub_8115634: @ 8115634
_08115674:
adds r4, r6, 0
ldrh r0, [r4, 0x24]
- bl sine2
+ bl Sin2
lsls r0, 16
lsrs r5, r0, 16
ldrh r0, [r4, 0x24]
- bl cosine2
+ bl Cos2
lsls r0, 16
lsrs r1, r0, 16
lsls r0, r5, 16
@@ -322706,11 +322706,11 @@ sub_8117E98: @ 8117E98
lsrs r4, r0, 16
_08117EB8:
adds r0, r4, 0
- bl sine2
+ bl Sin2
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
- bl cosine2
+ bl Cos2
lsls r2, r5, 16
asrs r2, 16
movs r3, 0x30
@@ -323868,12 +323868,12 @@ _08118790:
bl __fixsfsi
strh r0, [r6, 0x36]
ldrh r0, [r6, 0x34]
- bl sine2
+ bl Sin2
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldrh r0, [r6, 0x34]
- bl cosine2
+ bl Cos2
lsls r4, 16
asrs r4, 16
movs r2, 0x36
@@ -323937,12 +323937,12 @@ sub_8118834: @ 8118834
strh r0, [r5, 0x34]
_08118850:
ldrh r0, [r5, 0x34]
- bl sine2
+ bl Sin2
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldrh r0, [r5, 0x34]
- bl cosine2
+ bl Cos2
lsls r4, 16
asrs r4, 16
movs r2, 0x36
@@ -329051,7 +329051,7 @@ sub_811B000: @ 811B000
_0811B026:
lsrs r0, r4, 8
asrs r1, r7, 16
- bl sine
+ bl Sin
ldr r2, _0811B080
lsls r1, r5, 1
adds r1, r2
@@ -330780,7 +330780,7 @@ _0811BD9A:
_0811BD9E:
lsrs r0, r4, 8
asrs r1, r7, 16
- bl sine
+ bl Sin
ldr r1, _0811BE30
lsls r2, r5, 1
adds r2, r1
@@ -331000,7 +331000,7 @@ sub_811BF2C: @ 811BF2C
_0811BF52:
adds r0, r5, 0
movs r1, 0x28
- bl sine
+ bl Sin
ldrh r1, [r4, 0xA]
adds r0, r1
lsls r0, 16
@@ -331442,7 +331442,7 @@ sub_811C2A4: @ 811C2A4
_0811C2BC:
adds r0, r5, 0
movs r1, 0x10
- bl sine
+ bl Sin
ldrh r1, [r4, 0xC]
adds r0, r1
lsls r0, 16
@@ -331473,7 +331473,7 @@ _0811C2DC:
_0811C2F6:
adds r0, r5, 0
movs r1, 0x10
- bl sine
+ bl Sin
ldrh r1, [r4, 0xE]
subs r1, r0
lsls r1, 16
@@ -334121,7 +334121,7 @@ _0811D720:
ands r0, r4
mov r2, r8
asrs r1, r2, 16
- bl sine
+ bl Sin
lsls r1, r6, 1
add r1, r10
add r0, r9
@@ -334184,13 +334184,13 @@ _0811D79C:
asrs r0, r5, 16
mov r10, r0
ldr r1, [sp, 0x4]
- bl sine
+ bl Sin
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r10
ldr r1, [sp, 0x4]
- bl cosine
+ bl Cos
ldr r2, [sp]
lsls r1, r2, 16
asrs r1, 16
@@ -334255,7 +334255,7 @@ _0811D808:
lsls r0, 16
asrs r0, 16
ldr r1, [sp, 0x4]
- bl cosine
+ bl Cos
lsls r0, 16
asrs r0, 16
ldr r2, [sp, 0x8]
@@ -365407,7 +365407,7 @@ _0812C8A8:
strh r1, [r4, 0x24]
ands r0, r3
movs r1, 0x5
- bl sine
+ bl Sin
movs r2, 0x36
ldrsh r1, [r4, r2]
lsrs r2, r1, 31
@@ -369432,7 +369432,7 @@ _0812E822:
movs r0, 0xFF
ands r0, r1
movs r1, 0x10
- bl sine
+ bl Sin
b _0812E858
.align 2, 0
_0812E830: .4byte 0x0202f7c8
@@ -369453,7 +369453,7 @@ _0812E84C:
movs r0, 0xFF
ands r0, r1
movs r1, 0x10
- bl cosine
+ bl Cos
_0812E858:
strh r0, [r4, 0x26]
pop {r4}
@@ -370327,14 +370327,14 @@ sub_812EEEC: @ 812EEEC
ldrh r1, [r4, 0x32]
lsls r1, 16
asrs r1, 24
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r2, 0x30
ldrsh r0, [r4, r2]
ldrh r1, [r4, 0x34]
lsls r1, 16
asrs r1, 24
- bl cosine
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
adds r0, 0x9
@@ -371594,7 +371594,7 @@ sub_812F8DC: @ 812F8DC
bl sub_812F86C
adds r0, r4, 0
movs r1, 0x8
- bl sine
+ bl Sin
strh r0, [r5, 0x26]
movs r1, 0x2E
ldrsh r0, [r5, r1]
@@ -375721,7 +375721,7 @@ _08131868:
ldrsh r0, [r4, r2]
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -376584,7 +376584,7 @@ _08131F72:
ldrsh r0, [r4, r1]
movs r2, 0x2E
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r2, [r4, 0x30]
adds r0, r2, 0x5
@@ -377069,12 +377069,12 @@ sub_8132318: @ 8132318
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x14
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x14
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
adds r0, r4, 0
adds r0, 0x3F
@@ -379010,7 +379010,7 @@ sub_8133300: @ 8133300
_08133324:
adds r0, r1, 0
movs r1, 0x3
- bl sine
+ bl Sin
ldrh r1, [r4, 0x32]
adds r2, r0, 0
muls r2, r1
@@ -379020,7 +379020,7 @@ _08133324:
_08133338:
adds r0, r1, 0
movs r1, 0x1
- bl sine
+ bl Sin
ldrh r1, [r4, 0x32]
adds r2, r0, 0
muls r2, r1
@@ -396849,7 +396849,7 @@ _0813C182:
movs r1, 0x7F
ands r0, r1
movs r1, 0x30
- bl sine
+ bl Sin
ldr r1, _0813C1EC
strh r0, [r1]
ldrh r2, [r4, 0xE]
@@ -399813,7 +399813,7 @@ _0813D8E2:
lsls r0, 24
lsrs r0, 24
movs r1, 0x8
- bl sine
+ bl Sin
ldr r1, _0813D904
ldrh r1, [r1]
subs r0, r1
@@ -400058,14 +400058,14 @@ _0813DAC0:
lsls r0, r1, 24
lsrs r0, 24
movs r1, 0x78
- bl sine
+ bl Sin
negs r0, r0
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x34]
lsls r0, 24
lsrs r0, 24
movs r1, 0x8C
- bl sine
+ bl Sin
negs r0, r0
strh r0, [r4, 0x24]
movs r1, 0x34
@@ -401235,7 +401235,7 @@ _0813E3A8:
lsls r0, 24
lsrs r0, 24
movs r1, 0x18
- bl sine
+ bl Sin
negs r0, r0
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
@@ -401312,7 +401312,7 @@ _0813E440:
lsls r0, 24
lsrs r0, 24
movs r1, 0x18
- bl sine
+ bl Sin
negs r0, r0
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
@@ -401402,7 +401402,7 @@ _0813E4F8:
lsls r0, 24
lsrs r0, 24
movs r1, 0x28
- bl sine
+ bl Sin
adds r4, r0, 0
movs r1, 0x2E
ldrsh r0, [r5, r1]
@@ -401411,14 +401411,14 @@ _0813E4F8:
lsls r4, 16
asrs r4, 16
adds r1, r4, 0
- bl cosine
+ bl Cos
strh r0, [r5, 0x24]
movs r2, 0x2E
ldrsh r0, [r5, r2]
lsls r0, 29
lsrs r0, 24
adds r1, r4, 0
- bl sine
+ bl Sin
strh r0, [r5, 0x26]
movs r1, 0x2E
ldrsh r0, [r5, r1]
@@ -404839,14 +404839,14 @@ sub_8140014: @ 8140014
strh r1, [r4, 0x38]
movs r0, 0
movs r1, 0x20
- bl cosine
+ bl Cos
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x22]
movs r0, 0x36
ldrsh r1, [r4, r0]
movs r0, 0
- bl cosine
+ bl Cos
negs r0, r0
strh r0, [r4, 0x26]
ldr r0, _08140054
@@ -404877,7 +404877,7 @@ _0814006E:
ldrsh r0, [r4, r1]
movs r2, 0x36
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
negs r0, r0
strh r0, [r4, 0x26]
ldrh r1, [r4, 0x38]
@@ -404937,7 +404937,7 @@ _081400E2:
ldrsh r0, [r4, r2]
movs r2, 0x36
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
negs r0, r0
strh r0, [r4, 0x26]
ldrh r1, [r4, 0x38]
@@ -404961,7 +404961,7 @@ _0814010E:
strh r5, [r4, 0x34]
movs r0, 0x40
movs r1, 0x20
- bl cosine
+ bl Cos
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x22]
@@ -406150,13 +406150,13 @@ sub_8140A28: @ 8140A28
ldrsh r0, [r4, r1]
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
adds r0, 0x2
@@ -406728,13 +406728,13 @@ sub_8140ECC: @ 8140ECC
ldrsh r0, [r4, r1]
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r2, 0x32
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x36]
ldrh r1, [r4, 0x2E]
@@ -406875,19 +406875,19 @@ sub_8140FF8: @ 8140FF8
ldrsh r0, [r5, r1]
movs r2, 0x30
ldrsh r1, [r5, r2]
- bl sine
+ bl Sin
strh r0, [r5, 0x24]
movs r0, 0x2E
ldrsh r4, [r5, r0]
movs r2, 0x32
ldrsh r1, [r5, r2]
adds r0, r4, 0
- bl sine
+ bl Sin
adds r1, r0, 0
lsls r1, 16
asrs r1, 16
adds r0, r4, 0
- bl cosine
+ bl Cos
strh r0, [r5, 0x26]
ldrh r0, [r5, 0x2E]
adds r0, 0x6
@@ -407154,7 +407154,7 @@ sub_8141230: @ 8141230
ldrsh r0, [r5, r1]
movs r2, 0x30
ldrsh r1, [r5, r2]
- bl sine
+ bl Sin
strh r0, [r5, 0x24]
movs r0, 0x2E
ldrsh r4, [r5, r0]
@@ -407163,12 +407163,12 @@ sub_8141230: @ 8141230
ands r0, r1
movs r2, 0x32
ldrsh r1, [r5, r2]
- bl sine
+ bl Sin
adds r1, r0, 0
lsls r1, 16
asrs r1, 16
adds r0, r4, 0
- bl cosine
+ bl Cos
strh r0, [r5, 0x26]
ldrh r0, [r5, 0x2E]
adds r0, 0xA
@@ -408292,12 +408292,12 @@ sub_8141B20: @ 8141B20
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x18
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x18
- bl cosine
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
adds r0, 0xC
@@ -413816,7 +413816,7 @@ _08144760:
movs r1, 0x7F
ands r0, r1
movs r1, 0xC
- bl sine
+ bl Sin
ldr r1, _08144780
strh r0, [r1]
b _081447A8
@@ -413838,7 +413838,7 @@ _08144784:
movs r1, 0x7F
ands r0, r1
movs r1, 0xC
- bl sine
+ bl Sin
strh r0, [r7]
_081447A8:
ldrh r0, [r4, 0x12]
@@ -413945,7 +413945,7 @@ _08144866:
movs r1, 0x7F
ands r0, r1
movs r1, 0x14
- bl sine
+ bl Sin
ldr r1, _08144878
strh r0, [r1]
b _0814492C
@@ -421476,13 +421476,13 @@ _0814854C:
ldrsh r0, [r5, r2]
movs r2, 0x4
ldrsh r1, [r5, r2]
- bl sine
+ bl Sin
strh r0, [r5, 0x14]
movs r1, 0
ldrsh r0, [r5, r1]
movs r2, 0x6
ldrsh r1, [r5, r2]
- bl cosine
+ bl Cos
strh r0, [r5, 0x16]
ldrh r0, [r5, 0x8]
strh r0, [r5, 0x18]
@@ -421748,7 +421748,7 @@ _0814876A:
adds r1, r2, r5
lsls r1, 16
asrs r1, 16
- bl sine
+ bl Sin
lsls r4, 1
mov r2, r9
adds r1, r4, r2
@@ -421769,7 +421769,7 @@ _081487AC:
subs r1, r2, r5
lsls r1, 16
asrs r1, 16
- bl sine
+ bl Sin
lsls r4, 1
mov r2, r9
adds r1, r4, r2
@@ -421782,7 +421782,7 @@ _081487AC:
_081487CE:
lsls r1, 16
asrs r1, 16
- bl cosine
+ bl Cos
add r4, r10
adds r0, r7, r0
strh r0, [r4]
@@ -423448,7 +423448,7 @@ sub_8149558: @ 8149558
lsrs r0, 24
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -423462,7 +423462,7 @@ _08149592:
lsrs r0, 24
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x3A]
adds r0, 0x4
@@ -423596,7 +423596,7 @@ sub_8149670: @ 8149670
lsrs r0, 24
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -423610,14 +423610,14 @@ _081496A8:
lsrs r0, 24
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x3C
ldrsh r0, [r4, r1]
lsls r0, 26
lsrs r0, 24
movs r1, 0x28
- bl sine
+ bl Sin
adds r0, 0x8
strh r0, [r4, 0x38]
ldrh r0, [r4, 0x3C]
@@ -423700,14 +423700,14 @@ sub_814974C: @ 814974C
lsrs r0, 24
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x3A]
lsls r0, 24
lsrs r0, 24
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x38]
ldrh r1, [r4, 0x34]
@@ -423802,7 +423802,7 @@ _08149810:
lsrs r0, 24
movs r5, 0x38
ldrsh r1, [r4, r5]
- bl sine
+ bl Sin
negs r0, r0
strh r0, [r4, 0x26]
movs r0, 0x34
diff --git a/asm/rom_803D1FC.s b/asm/rom_803D1FC.s
index 802d64cef..6754d7317 100644
--- a/asm/rom_803D1FC.s
+++ b/asm/rom_803D1FC.s
@@ -5836,91 +5836,4 @@ unref_sub_8040DAC: @ 8040DAC
bx r1
thumb_func_end unref_sub_8040DAC
- thumb_func_start sine
-sine: @ 8040DEC
- lsls r1, 16
- asrs r1, 16
- ldr r2, _08040E04
- lsls r0, 16
- asrs r0, 15
- adds r0, r2
- movs r2, 0
- ldrsh r0, [r0, r2]
- muls r0, r1
- lsls r0, 8
- asrs r0, 16
- bx lr
- .align 2, 0
-_08040E04: .4byte gSineTable
- thumb_func_end sine
-
- thumb_func_start cosine
-cosine: @ 8040E08
- lsls r1, 16
- asrs r1, 16
- ldr r2, _08040E24
- lsls r0, 16
- asrs r0, 15
- adds r0, 0x80
- adds r0, r2
- movs r2, 0
- ldrsh r0, [r0, r2]
- muls r0, r1
- lsls r0, 8
- asrs r0, 16
- bx lr
- .align 2, 0
-_08040E24: .4byte gSineTable
- thumb_func_end cosine
-
- thumb_func_start sine2
-sine2: @ 8040E28
- push {r4,r5,lr}
- adds r5, r0, 0
- lsls r5, 16
- lsrs r5, 16
- adds r0, r5, 0
- movs r1, 0xB4
- bl __umodsi3
- adds r4, r0, 0
- lsls r4, 16
- lsrs r4, 16
- adds r0, r5, 0
- movs r1, 0xB4
- bl __udivsi3
- movs r1, 0x1
- ands r0, r1
- ldr r1, _08040E5C
- lsls r4, 1
- adds r4, r1
- ldrh r1, [r4]
- cmp r0, 0
- bne _08040E60
- lsls r0, r1, 16
- b _08040E64
- .align 2, 0
-_08040E5C: .4byte gSineDegreeTable
-_08040E60:
- lsls r0, r1, 16
- negs r0, r0
-_08040E64:
- asrs r0, 16
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end sine2
-
- thumb_func_start cosine2
-cosine2: @ 8040E6C
- push {lr}
- lsls r0, 16
- movs r1, 0xB4
- lsls r1, 15
- adds r0, r1
- lsrs r0, 16
- bl sine2
- lsls r0, 16
- asrs r0, 16
- pop {r1}
- bx r1
- thumb_func_end cosine2
+ .align 2, 0 @ Don't pad with nop.
diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s
index 8ffe9a35a..cc67845b8 100644
--- a/asm/rom_8040EB4.s
+++ b/asm/rom_8040EB4.s
@@ -4680,7 +4680,7 @@ _08043304:
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x1
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -4733,7 +4733,7 @@ _0804336C:
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x2
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -4816,7 +4816,7 @@ _08043418:
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x2
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -11457,14 +11457,14 @@ sub_80467F8: @ 80467F8
strh r1, [r4, 0x38]
movs r0, 0
movs r1, 0x20
- bl cosine
+ bl Cos
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x22]
movs r0, 0x36
ldrsh r1, [r4, r0]
movs r0, 0
- bl cosine
+ bl Cos
negs r0, r0
strh r0, [r4, 0x26]
ldr r0, _08046848
@@ -11495,7 +11495,7 @@ _08046862:
ldrsh r0, [r4, r1]
movs r2, 0x36
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
negs r0, r0
strh r0, [r4, 0x26]
ldrh r1, [r4, 0x38]
@@ -11555,7 +11555,7 @@ _080468D6:
ldrsh r0, [r4, r2]
movs r2, 0x36
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
negs r0, r0
strh r0, [r4, 0x26]
ldrh r1, [r4, 0x38]
@@ -11579,7 +11579,7 @@ _08046902:
strh r5, [r4, 0x34]
movs r0, 0x40
movs r1, 0x20
- bl cosine
+ bl Cos
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x22]
@@ -12596,7 +12596,7 @@ _08047126:
ands r0, r2
movs r2, 0x38
ldrsh r1, [r5, r2]
- bl sine
+ bl Sin
ldrh r1, [r5, 0x26]
adds r0, r1
strh r0, [r5, 0x26]
diff --git a/asm/rom_8074BAC.s b/asm/rom_8074BAC.s
index 0a55d74f3..d3b081455 100644
--- a/asm/rom_8074BAC.s
+++ b/asm/rom_8074BAC.s
@@ -6969,13 +6969,13 @@ sub_8078114: @ 8078114
ldrsh r0, [r4, r2]
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
ldrh r2, [r4, 0x2E]
@@ -7028,7 +7028,7 @@ sub_8078174: @ 8078174
adds r1, r2
lsls r1, 16
asrs r1, 16
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -7039,7 +7039,7 @@ sub_8078174: @ 8078174
adds r1, r2
lsls r1, 16
asrs r1, 16
- bl cosine
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
ldrh r2, [r4, 0x2E]
@@ -7091,13 +7091,13 @@ unref_sub_80781F0: @ 80781F0
ldrsh r0, [r4, r2]
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x36
ldrsh r0, [r4, r1]
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
ldrh r2, [r4, 0x2E]
@@ -7167,13 +7167,13 @@ sub_8078278: @ 8078278
ldrsh r0, [r4, r2]
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r2, 0x36
ldrsh r1, [r4, r2]
- bl cosine
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
ldrh r2, [r4, 0x2E]
@@ -7824,7 +7824,7 @@ sub_8078718: @ 8078718
lsrs r0, 24
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sine
+ bl Sin
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
diff --git a/ld_script.txt b/ld_script.txt
index 70d59a52d..aa9fe040c 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -82,6 +82,7 @@ SECTIONS {
asm/rom_803BA2C.o(.text);
src/pokemon_2.o(.text);
asm/rom_803D1FC.o(.text);
+ src/trig.o(.text);
src/rng.o(.text);
asm/rom_8040EB4.o(.text);
src/play_time.o(.text);
diff --git a/src/trig.c b/src/trig.c
new file mode 100644
index 000000000..cd9f39cac
--- /dev/null
+++ b/src/trig.c
@@ -0,0 +1,35 @@
+#include "global.h"
+
+extern s16 gSineTable[];
+extern s16 gSineDegreeTable[];
+
+// amplitude * sin(index*(π/128))
+s16 Sin(s16 index, s16 amplitude)
+{
+ return (amplitude * gSineTable[index]) >> 8;
+}
+
+// amplitude * cos(index*(π/128))
+s16 Cos(s16 index, s16 amplitude)
+{
+ return (amplitude * gSineTable[index + 64]) >> 8;
+}
+
+// angle in degrees
+s16 Sin2(u16 angle)
+{
+ s32 angleMod = angle % 180;
+ s32 negate = ((angle / 180) & 1);
+ s16 value = gSineDegreeTable[angleMod];
+
+ if (negate)
+ return -value;
+ else
+ return value;
+}
+
+// angle in degrees
+s16 Cos2(u16 angle)
+{
+ return Sin2(angle + 90);
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 23:47:41 +0000