pret/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-10-01 07:30:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Split FX_sincos

Browse Source
This commit is contained in:
PikalaxALT
2021-05-23 07:16:39 -04:00
parent de4dba08bb
commit de8a5e2c14
30 changed files with 4340 additions and 1262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arm9/arm9.lsf
+1
View File
@@ -371,6 +371,7 @@ Static arm9
Object FX_mtx44.o
Object FX_cp.o
Object FX_vec.o
Object FX_sincos.o
Object FX_atan.o
Object FX.o
Object GX.o
arm9/asm/NNS_FND_allocator.s
+1
View File
@@ -3,6 +3,7 @@
.rodata
; static const in function
.global UNK_020FF7CC
UNK_020FF7CC: ; 0x020FF7CC
.word FUN_020AE894
arm9/asm/unk_02006D98.s
+5 -5
View File
@@ -2,7 +2,7 @@
.include "global.inc"
.extern UNK_020ECD4C
.extern UNK_020FFA38
.extern FX_SinCosTable_
.section .rodata
@@ -349,7 +349,7 @@ _02006F7E:
ldrh r0, [r4, #0x38]
asr r0, r0, #0x4
lsl r1, r0, #0x2
ldr r0, _02007268 ; =UNK_020FFA38
ldr r0, _02007268 ; =FX_SinCosTable_
add r2, r0, r1
ldrsh r0, [r0, r1]
mov r1, #0x2
@@ -358,7 +358,7 @@ _02006F7E:
ldrh r0, [r4, #0x3a]
asr r0, r0, #0x4
lsl r1, r0, #0x2
ldr r0, _02007268 ; =UNK_020FFA38
ldr r0, _02007268 ; =FX_SinCosTable_
add r2, r0, r1
ldrsh r0, [r0, r1]
mov r1, #0x2
@@ -367,7 +367,7 @@ _02006F7E:
ldrh r0, [r4, #0x3c]
asr r0, r0, #0x4
lsl r1, r0, #0x2
ldr r0, _02007268 ; =UNK_020FFA38
ldr r0, _02007268 ; =FX_SinCosTable_
add r2, r0, r1
ldrsh r0, [r0, r1]
mov r1, #0x2
@@ -689,7 +689,7 @@ _02007258: .word 0x000002E3
_0200725C: .word 0x04000454
_02007260: .word 0x040004AC
_02007264: .word 0x04000470
_02007268: .word UNK_020FFA38
_02007268: .word FX_SinCosTable_
_0200726C: .word 0x040004C0
_02007270: .word 0x00004210
_02007274: .word 0x040004A4
arm9/asm/unk_0200E850.s
+5 -5
View File
@@ -1,7 +1,7 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_020FFA38
.extern FX_SinCosTable_
.section .rodata
@@ -1353,7 +1353,7 @@ FUN_0200F0B4: ; 0x0200F0B4
asr r0, r0, #0x4
lsl r1, r0, #0x1
lsl r0, r1, #0x1
ldr r2, _0200F0C8 ; =UNK_020FFA38
ldr r2, _0200F0C8 ; =FX_SinCosTable_
add r1, r1, #0x1
lsl r1, r1, #0x1
ldr r3, _0200F0CC ; =FX_Div
@@ -1361,7 +1361,7 @@ FUN_0200F0B4: ; 0x0200F0B4
ldrsh r1, [r2, r1]
bx r3
.balign 4
_0200F0C8: .word UNK_020FFA38
_0200F0C8: .word FX_SinCosTable_
_0200F0CC: .word FX_Div
thumb_func_start FUN_0200F0D0
@@ -4153,7 +4153,7 @@ FUN_020105A0: ; 0x020105A0
ldr r2, [r4, #0xc]
asr r0, r0, #0x4
lsl r1, r0, #0x2
ldr r0, _02010680 ; =UNK_020FFA38
ldr r0, _02010680 ; =FX_SinCosTable_
asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
@@ -4249,7 +4249,7 @@ _02010634:
add sp, #0x110
pop {r4-r7, pc}
.balign 4
_02010680: .word UNK_020FFA38
_02010680: .word FX_SinCosTable_
_02010684: .word 0x0000FFFF
thumb_func_start FUN_02010688
arm9/asm/unk_02011744.s
+1 -1
View File
@@ -1,7 +1,7 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_020FFA38
.extern FX_SinCosTable_
.section .rodata
arm9/asm/unk_02012944.s
+2 -2
View File
@@ -323,7 +323,7 @@ FUN_02012B88: ; 0x02012B88
_02012BA0:
asr r0, r4, #0x4
lsl r1, r0, #0x2
ldr r0, _02012BDC ; =UNK_020FFA38
ldr r0, _02012BDC ; =FX_SinCosTable_
ldr r2, [sp, #0x4]
ldrsh r0, [r0, r1]
ldr r3, [sp, #0x8]
@@ -351,7 +351,7 @@ _02012BD6:
add sp, #0xc
pop {r4-r7, pc}
nop
_02012BDC: .word UNK_020FFA38
_02012BDC: .word FX_SinCosTable_
_02012BE0: .word 0x00000000
thumb_func_start FUN_02012BE4
arm9/asm/unk_02013CD4.s
+3 -3
View File
@@ -2,7 +2,7 @@
.include "global.inc"
.extern UNK_021064C0
.extern UNK_020FFA38
.extern FX_SinCosTable_
.extern UNK_021064B8
.extern UNK_021064C4
.extern UNK_021064BC
@@ -741,7 +741,7 @@ _02014172:
str r1, [r3, #0x0]
str r2, [r3, #0x0]
ldr r0, [r5, #0x18]
ldr r1, _0201420C ; =UNK_020FFA38
ldr r1, _0201420C ; =FX_SinCosTable_
asr r0, r0, #0x4
lsl r2, r0, #0x1
lsl r0, r2, #0x1
@@ -793,7 +793,7 @@ _020141FC: .word 0x7FFF8000
_02014200: .word 0x00004210
_02014204: .word 0x040004AC
_02014208: .word 0x04000470
_0201420C: .word UNK_020FFA38
_0201420C: .word FX_SinCosTable_
_02014210: .word 0x0400046C
_02014214: .word 0x04000448
arm9/asm/unk_02014BF4.s
+15 -15
View File
@@ -1,7 +1,7 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_020FFA38
.extern FX_SinCosTable_
.section .rodata
@@ -1311,7 +1311,7 @@ FUN_0201551C: ; 0x0201551C
ldr r2, [sp, #0x4]
asr r0, r0, #0x4
lsl r1, r0, #0x2
ldr r0, _0201554C ; =UNK_020FFA38
ldr r0, _0201554C ; =FX_SinCosTable_
ldrsh r0, [r0, r1]
mul r0, r2
asr r1, r0, #0xc
@@ -1323,7 +1323,7 @@ FUN_0201551C: ; 0x0201551C
add sp, #0xc
pop {r3-r4, pc}
nop
_0201554C: .word UNK_020FFA38
_0201554C: .word FX_SinCosTable_
thumb_func_start FUN_02015550
FUN_02015550: ; 0x02015550
@@ -1340,7 +1340,7 @@ FUN_02015550: ; 0x02015550
lsl r1, r1, #0x1
add r1, r1, #0x1
lsl r2, r1, #0x1
ldr r1, _02015584 ; =UNK_020FFA38
ldr r1, _02015584 ; =FX_SinCosTable_
ldrsh r1, [r1, r2]
mul r1, r0
add r0, sp, #0x0
@@ -1352,7 +1352,7 @@ FUN_02015550: ; 0x02015550
add sp, #0xc
pop {r3-r4, pc}
nop
_02015584: .word UNK_020FFA38
_02015584: .word FX_SinCosTable_
thumb_func_start FUN_02015588
FUN_02015588: ; 0x02015588
@@ -2032,7 +2032,7 @@ _02015A5C: ; jump table (using 16-bit offset)
_02015A64:
asr r0, r1, #0x4
lsl r1, r0, #0x2
ldr r0, _02015AE8 ; =UNK_020FFA38
ldr r0, _02015AE8 ; =FX_SinCosTable_
ldr r2, [r4, #0xc]
ldrsh r0, [r0, r1]
mul r0, r2
@@ -2045,7 +2045,7 @@ _02015A78:
lsl r1, r1, #0x1
add r1, r1, #0x1
lsl r2, r1, #0x1
ldr r1, _02015AE8 ; =UNK_020FFA38
ldr r1, _02015AE8 ; =FX_SinCosTable_
ldr r0, [r4, #0xc]
ldrsh r1, [r1, r2]
mul r1, r0
@@ -2056,7 +2056,7 @@ _02015A78:
_02015A90:
asr r0, r1, #0x4
lsl r1, r0, #0x2
ldr r0, _02015AE8 ; =UNK_020FFA38
ldr r0, _02015AE8 ; =FX_SinCosTable_
ldr r2, [r4, #0xc]
ldrsh r0, [r0, r1]
mul r0, r2
@@ -2070,7 +2070,7 @@ _02015AA6:
lsl r1, r1, #0x1
add r1, r1, #0x1
lsl r2, r1, #0x1
ldr r1, _02015AE8 ; =UNK_020FFA38
ldr r1, _02015AE8 ; =FX_SinCosTable_
ldr r0, [r4, #0xc]
ldrsh r1, [r1, r2]
mul r1, r0
@@ -2101,7 +2101,7 @@ _02015AC4:
_02015AE6:
pop {r4, pc}
.balign 4
_02015AE8: .word UNK_020FFA38
_02015AE8: .word FX_SinCosTable_
thumb_func_start FUN_02015AEC
FUN_02015AEC: ; 0x02015AEC
@@ -2135,7 +2135,7 @@ _02015B1A: ; jump table (using 16-bit offset)
_02015B22:
asr r0, r1, #0x4
lsl r1, r0, #0x2
ldr r0, _02015BA8 ; =UNK_020FFA38
ldr r0, _02015BA8 ; =FX_SinCosTable_
ldr r2, [r4, #0xc]
ldrsh r0, [r0, r1]
mul r0, r2
@@ -2148,7 +2148,7 @@ _02015B36:
lsl r1, r1, #0x1
add r1, r1, #0x1
lsl r2, r1, #0x1
ldr r1, _02015BA8 ; =UNK_020FFA38
ldr r1, _02015BA8 ; =FX_SinCosTable_
ldr r0, [r4, #0xc]
ldrsh r1, [r1, r2]
mul r1, r0
@@ -2159,7 +2159,7 @@ _02015B36:
_02015B4E:
asr r0, r1, #0x4
lsl r1, r0, #0x2
ldr r0, _02015BA8 ; =UNK_020FFA38
ldr r0, _02015BA8 ; =FX_SinCosTable_
ldr r2, [r4, #0xc]
ldrsh r0, [r0, r1]
mul r0, r2
@@ -2173,7 +2173,7 @@ _02015B64:
lsl r1, r1, #0x1
add r1, r1, #0x1
lsl r2, r1, #0x1
ldr r1, _02015BA8 ; =UNK_020FFA38
ldr r1, _02015BA8 ; =FX_SinCosTable_
ldr r0, [r4, #0xc]
ldrsh r1, [r1, r2]
mul r1, r0
@@ -2204,7 +2204,7 @@ _02015B82:
_02015BA4:
pop {r4, pc}
nop
_02015BA8: .word UNK_020FFA38
_02015BA8: .word FX_SinCosTable_
thumb_func_start FUN_02015BAC
FUN_02015BAC: ; 0x02015BAC
arm9/asm/unk_0201C7A0.s
+7 -7
View File
@@ -2,7 +2,7 @@
.include "global.inc"
.extern gSineTable
.extern UNK_020FFA38
.extern FX_SinCosTable_
.text
@@ -401,7 +401,7 @@ FUN_0201CAA8: ; 0x0201CAA8
sub sp, #0x24
add r4, r1, #0x0
ldr r1, [r4, #0x0]
ldr r3, _0201CB1C ; =UNK_020FFA38
ldr r3, _0201CB1C ; =FX_SinCosTable_
lsl r1, r1, #0x10
lsr r1, r1, #0x10
asr r1, r1, #0x4
@@ -414,7 +414,7 @@ FUN_0201CAA8: ; 0x0201CAA8
add r5, r0, #0x0
bl MTX_RotX33_
ldr r0, [r4, #0x4]
ldr r3, _0201CB1C ; =UNK_020FFA38
ldr r3, _0201CB1C ; =FX_SinCosTable_
lsl r0, r0, #0x10
lsr r0, r0, #0x10
asr r0, r0, #0x4
@@ -431,7 +431,7 @@ FUN_0201CAA8: ; 0x0201CAA8
add r2, r5, #0x0
bl MTX_Concat33
ldr r0, [r4, #0x8]
ldr r3, _0201CB1C ; =UNK_020FFA38
ldr r3, _0201CB1C ; =FX_SinCosTable_
lsl r0, r0, #0x10
lsr r0, r0, #0x10
asr r0, r0, #0x4
@@ -450,7 +450,7 @@ FUN_0201CAA8: ; 0x0201CAA8
add sp, #0x24
pop {r4-r5, pc}
nop
_0201CB1C: .word UNK_020FFA38
_0201CB1C: .word FX_SinCosTable_
thumb_func_start FUN_0201CB20
FUN_0201CB20: ; 0x0201CB20
@@ -504,7 +504,7 @@ FUN_0201CB7C: ; 0x0201CB7C
lsl r2, r0, #0x1
add r6, r1, #0x0
lsl r0, r2, #0x1
ldr r1, _0201CBE8 ; =UNK_020FFA38
ldr r1, _0201CBE8 ; =FX_SinCosTable_
add r2, r2, #0x1
lsl r2, r2, #0x1
ldrsh r0, [r1, r0]
@@ -550,4 +550,4 @@ FUN_0201CB7C: ; 0x0201CB7C
str r1, [r5, #0x0]
pop {r3-r7, pc}
.balign 4
_0201CBE8: .word UNK_020FFA38
_0201CBE8: .word FX_SinCosTable_
arm9/asm/unk_0201E7D8.s
+19 -19
View File
@@ -4,7 +4,7 @@
.extern UNK_021CED98
.extern UNK_021CEF64
.extern UNK_021CED20
.extern UNK_020FFA38
.extern FX_SinCosTable_
.extern UNK_021CEF58
.extern UNK_021CEF70
.extern UNK_021CED64
@@ -32,7 +32,7 @@ FUN_0201E7D8: ; 0x0201E7D8
ldrh r4, [r5, #0x3c]
asr r0, r0, #0x4
lsl r1, r0, #0x2
ldr r0, _0201E8B4 ; =UNK_020FFA38
ldr r0, _0201E8B4 ; =FX_SinCosTable_
asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
@@ -46,7 +46,7 @@ FUN_0201E7D8: ; 0x0201E7D8
lsl r2, r2, #0x1
add r2, r2, #0x1
lsl r3, r2, #0x1
ldr r2, _0201E8B4 ; =UNK_020FFA38
ldr r2, _0201E8B4 ; =FX_SinCosTable_
lsl r1, r1, #0x14
ldrsh r2, [r2, r3]
lsr r0, r0, #0xc
@@ -69,7 +69,7 @@ FUN_0201E7D8: ; 0x0201E7D8
lsl r0, r0, #0x1
add r0, r0, #0x1
lsl r1, r0, #0x1
ldr r0, _0201E8B4 ; =UNK_020FFA38
ldr r0, _0201E8B4 ; =FX_SinCosTable_
asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
@@ -86,7 +86,7 @@ FUN_0201E7D8: ; 0x0201E7D8
lsl r2, r2, #0x1
add r2, r2, #0x1
lsl r3, r2, #0x1
ldr r2, _0201E8B4 ; =UNK_020FFA38
ldr r2, _0201E8B4 ; =FX_SinCosTable_
orr r0, r1
ldrsh r2, [r2, r3]
asr r1, r0, #0x1f
@@ -106,7 +106,7 @@ FUN_0201E7D8: ; 0x0201E7D8
str r1, [r5, #0x1c]
asr r0, r0, #0x4
lsl r1, r0, #0x2
ldr r0, _0201E8B4 ; =UNK_020FFA38
ldr r0, _0201E8B4 ; =FX_SinCosTable_
ldr r2, [r5, #0x38]
ldrsh r0, [r0, r1]
asr r3, r2, #0x1f
@@ -129,7 +129,7 @@ FUN_0201E7D8: ; 0x0201E7D8
bl VEC_Add
pop {r3-r5, pc}
nop
_0201E8B4: .word UNK_020FFA38
_0201E8B4: .word FX_SinCosTable_
thumb_func_start FUN_0201E8B8
FUN_0201E8B8: ; 0x0201E8B8
@@ -140,7 +140,7 @@ FUN_0201E8B8: ; 0x0201E8B8
ldrh r4, [r5, #0x3c]
asr r0, r0, #0x4
lsl r1, r0, #0x2
ldr r0, _0201E998 ; =UNK_020FFA38
ldr r0, _0201E998 ; =FX_SinCosTable_
asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
@@ -154,7 +154,7 @@ FUN_0201E8B8: ; 0x0201E8B8
lsl r2, r2, #0x1
add r2, r2, #0x1
lsl r3, r2, #0x1
ldr r2, _0201E998 ; =UNK_020FFA38
ldr r2, _0201E998 ; =FX_SinCosTable_
lsl r1, r1, #0x14
ldrsh r2, [r2, r3]
lsr r0, r0, #0xc
@@ -178,7 +178,7 @@ FUN_0201E8B8: ; 0x0201E8B8
lsl r0, r0, #0x1
add r0, r0, #0x1
lsl r1, r0, #0x1
ldr r0, _0201E998 ; =UNK_020FFA38
ldr r0, _0201E998 ; =FX_SinCosTable_
asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
@@ -195,7 +195,7 @@ FUN_0201E8B8: ; 0x0201E8B8
lsl r2, r2, #0x1
add r2, r2, #0x1
lsl r3, r2, #0x1
ldr r2, _0201E998 ; =UNK_020FFA38
ldr r2, _0201E998 ; =FX_SinCosTable_
orr r0, r1
ldrsh r2, [r2, r3]
asr r1, r0, #0x1f
@@ -216,7 +216,7 @@ FUN_0201E8B8: ; 0x0201E8B8
lsr r0, r0, #0x10
asr r0, r0, #0x4
lsl r1, r0, #0x2
ldr r0, _0201E998 ; =UNK_020FFA38
ldr r0, _0201E998 ; =FX_SinCosTable_
ldr r2, [r5, #0x38]
ldrsh r0, [r0, r1]
asr r3, r2, #0x1f
@@ -240,7 +240,7 @@ FUN_0201E8B8: ; 0x0201E8B8
bl VEC_Add
pop {r3-r5, pc}
.balign 4
_0201E998: .word UNK_020FFA38
_0201E998: .word FX_SinCosTable_
thumb_func_start FUN_0201E99C
FUN_0201E99C: ; 0x0201E99C
@@ -249,7 +249,7 @@ FUN_0201E99C: ; 0x0201E99C
strh r0, [r2, #0x0]
asr r0, r0, #0x4
lsl r3, r0, #0x1
ldr r2, _0201E9E0 ; =UNK_020FFA38
ldr r2, _0201E9E0 ; =FX_SinCosTable_
lsl r0, r3, #0x1
ldrsh r0, [r2, r0]
str r0, [r1, #0x0]
@@ -278,7 +278,7 @@ FUN_0201E99C: ; 0x0201E99C
str r2, [r1, #0x64]
bx lr
nop
_0201E9E0: .word UNK_020FFA38
_0201E9E0: .word FX_SinCosTable_
_0201E9E4: .word 0x00001555
thumb_func_start FUN_0201E9E8
@@ -973,7 +973,7 @@ FUN_0201EEF0: ; 0x0201EEF0
ldr r3, _0201EF24 ; =FUN_0201EE2C
asr r0, r0, #0x4
lsl r2, r0, #0x2
ldr r0, _0201EF28 ; =UNK_020FFA38
ldr r0, _0201EF28 ; =FX_SinCosTable_
ldrsh r2, [r0, r2]
str r2, [r1, #0x0]
add r2, r1, #0x0
@@ -991,7 +991,7 @@ FUN_0201EEF0: ; 0x0201EEF0
bx r3
nop
_0201EF24: .word FUN_0201EE2C
_0201EF28: .word UNK_020FFA38
_0201EF28: .word FX_SinCosTable_
thumb_func_start FUN_0201EF2C
FUN_0201EF2C: ; 0x0201EF2C
@@ -1008,7 +1008,7 @@ FUN_0201EF2C: ; 0x0201EF2C
ldrh r0, [r0, #0x0]
asr r0, r0, #0x4
lsl r2, r0, #0x2
ldr r0, _0201EF6C ; =UNK_020FFA38
ldr r0, _0201EF6C ; =FX_SinCosTable_
ldrsh r2, [r0, r2]
str r2, [r1, #0x0]
add r2, r1, #0x0
@@ -1026,7 +1026,7 @@ FUN_0201EF2C: ; 0x0201EF2C
bx r3
nop
_0201EF68: .word FUN_0201EE2C
_0201EF6C: .word UNK_020FFA38
_0201EF6C: .word FX_SinCosTable_
thumb_func_start FUN_0201EF70
FUN_0201EF70: ; 0x0201EF70
arm9/asm/unk_0201F06C.s
+3 -3
View File
@@ -1,7 +1,7 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_020FFA38
.extern FX_SinCosTable_
.extern UNK_021064C0
.extern UNK_021064B8
.extern UNK_021064BC
@@ -3171,7 +3171,7 @@ _0202068E:
ldr r2, [r4, #0x20]
bl FUN_020B28B4
ldrh r0, [r4, #0x24]
ldr r2, _02020770 ; =UNK_020FFA38
ldr r2, _02020770 ; =FX_SinCosTable_
asr r0, r0, #0x4
lsl r1, r0, #0x1
lsl r0, r1, #0x1
@@ -3262,7 +3262,7 @@ _02020764:
add sp, #0xc
pop {r3-r6, pc}
.balign 4
_02020770: .word UNK_020FFA38
_02020770: .word FX_SinCosTable_
thumb_func_start FUN_02020774
FUN_02020774: ; 0x02020774
arm9/asm/unk_02053750.s
+5 -5
View File
@@ -1,7 +1,7 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_020FFA38
.extern FX_SinCosTable_
.section .rodata
.global UNK_020F5C04
@@ -1320,7 +1320,7 @@ FUN_020540E8: ; 0x020540E8
ldr r1, [sp, #0x4]
asr r0, r0, #0x4
lsl r5, r0, #0x2
ldr r0, _02054164 ; =UNK_020FFA38
ldr r0, _02054164 ; =FX_SinCosTable_
ldrsh r5, [r0, r5]
asr r0, r5, #0x1f
lsr r6, r5, #0x10
@@ -1363,7 +1363,7 @@ _0205415E:
add sp, #0xc
pop {r3-r6, pc}
.balign 4
_02054164: .word UNK_020FFA38
_02054164: .word FX_SinCosTable_
thumb_func_start FUN_02054168
FUN_02054168: ; 0x02054168
@@ -1801,7 +1801,7 @@ _0205447E:
ldr r6, [sp, #0x4]
asr r0, r0, #0x4
lsl r1, r0, #0x2
ldr r0, _02054500 ; =UNK_020FFA38
ldr r0, _02054500 ; =FX_SinCosTable_
ldrsh r0, [r0, r1]
asr r3, r0, #0x1f
lsr r1, r0, #0xf
@@ -1851,7 +1851,7 @@ _020544F8:
add sp, #0xc
pop {r4-r7, pc}
nop
_02054500: .word UNK_020FFA38
_02054500: .word FX_SinCosTable_
_02054504: .word 0x00000666
thumb_func_start FUN_02054508
arm9/asm/unk_0208AC14.s
+22 -22
View File
@@ -1,7 +1,7 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_020FFA38
.extern FX_SinCosTable_
.extern UNK_021064B8
.extern UNK_021064C0
@@ -1823,7 +1823,7 @@ FUN_0208C4F4: ; 0x0208C4F4
ldr r0, [r5, #0x40]
ldrh r1, [r4, #0x20]
ldr r0, [r0, #0x20]
ldr r6, _0208C954 ; =UNK_020FFA38
ldr r6, _0208C954 ; =FX_SinCosTable_
ldr r0, [r0, #0x14]
mov r1, r1, asr #0x4
ldrh r0, [r0, #0x0]
@@ -2087,7 +2087,7 @@ _0208C8BC:
bx lr
.balign 4
_0208C950: .word 0x040004A4
_0208C954: .word UNK_020FFA38
_0208C954: .word FX_SinCosTable_
_0208C958: .word UNK_02106160
_0208C95C: .word 0x00000CCD
_0208C960: .word 0xFFFFF333
@@ -2125,7 +2125,7 @@ FUN_0208C974: ; 0x0208C974
ldr r0, [r5, #0x40]
ldrh r1, [r4, #0x20]
ldr r0, [r0, #0x20]
ldr r6, _0208CDD0 ; =UNK_020FFA38
ldr r6, _0208CDD0 ; =FX_SinCosTable_
ldr r0, [r0, #0x0]
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -2388,7 +2388,7 @@ _0208CD38:
bx lr
.balign 4
_0208CDCC: .word 0x040004A4
_0208CDD0: .word UNK_020FFA38
_0208CDD0: .word FX_SinCosTable_
_0208CDD4: .word UNK_02106160
_0208CDD8: .word 0x00000CCD
_0208CDDC: .word 0xFFFFF333
@@ -2426,7 +2426,7 @@ FUN_0208CDF0: ; 0x0208CDF0
ldr r0, [r5, #0x40]
ldrh r1, [r4, #0x20]
ldr r0, [r0, #0x20]
ldr r6, _0208D128 ; =UNK_020FFA38
ldr r6, _0208D128 ; =FX_SinCosTable_
ldr r0, [r0, #0x14]
mov r1, r1, asr #0x4
ldrh r0, [r0, #0x0]
@@ -2612,7 +2612,7 @@ _0208D090:
bx lr
.balign 4
_0208D124: .word 0x040004A4
_0208D128: .word UNK_020FFA38
_0208D128: .word FX_SinCosTable_
_0208D12C: .word UNK_02106160
_0208D130: .word 0x04000454
_0208D134: .word 0x04000470
@@ -2648,7 +2648,7 @@ FUN_0208D140: ; 0x0208D140
ldr r0, [r5, #0x40]
ldrh r1, [r4, #0x20]
ldr r0, [r0, #0x20]
ldr r6, _0208D478 ; =UNK_020FFA38
ldr r6, _0208D478 ; =FX_SinCosTable_
ldr r0, [r0, #0x0]
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -2834,7 +2834,7 @@ _0208D3E0:
bx lr
.balign 4
_0208D474: .word 0x040004A4
_0208D478: .word UNK_020FFA38
_0208D478: .word FX_SinCosTable_
_0208D47C: .word UNK_02106160
_0208D480: .word 0x04000454
_0208D484: .word 0x04000470
@@ -3854,7 +3854,7 @@ _0208E39C:
str r3, [sp, #0x8]
bl MTX_MultVec43
ldrh r0, [r6, #0x20]
ldr r2, _0208E69C ; =UNK_020FFA38
ldr r2, _0208E69C ; =FX_SinCosTable_
mov r9, #0x0
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
@@ -3935,7 +3935,7 @@ _0208E4BC:
str r3, [sp, #0x8]
bl MTX_MultVec43
ldrh r0, [r6, #0x20]
ldr r2, _0208E69C ; =UNK_020FFA38
ldr r2, _0208E69C ; =FX_SinCosTable_
mov lr, #0x0
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
@@ -4029,7 +4029,7 @@ _0208E620:
bx lr
.balign 4
_0208E698: .word 0x040004A4
_0208E69C: .word UNK_020FFA38
_0208E69C: .word FX_SinCosTable_
_0208E6A0: .word 0x04000454
_0208E6A4: .word 0x04000470
_0208E6A8: .word 0x04000480
@@ -4139,7 +4139,7 @@ _0208E7E0:
str r3, [sp, #0x8]
bl MTX_MultVec43
ldrh r0, [r8, #0x20]
ldr r2, _0208EAE8 ; =UNK_020FFA38
ldr r2, _0208EAE8 ; =FX_SinCosTable_
ldr r12, [sp, #0x0]
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
@@ -4220,7 +4220,7 @@ _0208E90C:
str r3, [sp, #0x8]
bl MTX_MultVec43
ldrh r0, [r8, #0x20]
ldr r2, _0208EAE8 ; =UNK_020FFA38
ldr r2, _0208EAE8 ; =FX_SinCosTable_
mov r8, #0x0
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
@@ -4313,7 +4313,7 @@ _0208EA70:
bx lr
.balign 4
_0208EAE4: .word 0x040004A4
_0208EAE8: .word UNK_020FFA38
_0208EAE8: .word FX_SinCosTable_
_0208EAEC: .word 0x04000454
_0208EAF0: .word 0x04000470
_0208EAF4: .word 0x04000480
@@ -4846,12 +4846,12 @@ _0208F294:
add r1, r1, #0x10000
mov r2, r0, lsl #0x1
str r1, [sp, #0x18]
ldr r0, _0208FD98 ; =UNK_020FFA38
ldr r0, _0208FD98 ; =FX_SinCosTable_
mov r1, r2, lsl #0x1
ldrsh r0, [r0, r1]
add r1, r2, #0x1
mov r2, r1, lsl #0x1
ldr r1, _0208FD98 ; =UNK_020FFA38
ldr r1, _0208FD98 ; =FX_SinCosTable_
ldrsh r3, [r1, r2]
ldr r2, [r9, #0x5c]
mov r1, #0x800
@@ -5562,7 +5562,7 @@ _0208FD88: .word 0x00000FFF
_0208FD8C: .word UNK_021C8C5C
_0208FD90: .word 0x5EEDF715
_0208FD94: .word 0x1B0CB173
_0208FD98: .word UNK_020FFA38
_0208FD98: .word FX_SinCosTable_
_0208FD9C: .word 0x00000003
_0208FDA0: .word 0xAAAAAAAB
_0208FDA4: .word 0x0000FFFF
@@ -6265,7 +6265,7 @@ FUN_02090780: ; 0x02090780
b _02090838
_020907AC:
ldrh r1, [r0, #0x0]
ldr r3, _02090854 ; =UNK_020FFA38
ldr r3, _02090854 ; =FX_SinCosTable_
add r0, sp, #0x0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -6278,7 +6278,7 @@ _020907AC:
b _02090838
_020907DC:
ldrh r1, [r0, #0x0]
ldr r3, _02090854 ; =UNK_020FFA38
ldr r3, _02090854 ; =FX_SinCosTable_
add r0, sp, #0x0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -6291,7 +6291,7 @@ _020907DC:
b _02090838
_0209080C:
ldrh r1, [r0, #0x0]
ldr r3, _02090854 ; =UNK_020FFA38
ldr r3, _02090854 ; =FX_SinCosTable_
add r0, sp, #0x0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -6310,7 +6310,7 @@ _02090838:
ldmia sp!, {r4,lr}
bx lr
.balign 4
_02090854: .word UNK_020FFA38
_02090854: .word FX_SinCosTable_
arm_func_start FUN_02090858
FUN_02090858: ; 0x02090858
arm9/asm/unk_020ADA84.s
+52 -1081
View File
File diff suppressed because it is too large Load Diff
arm9/global.inc
+1 -1
View File
@@ -8236,7 +8236,7 @@
.extern Unk_02106A04
.extern UNK_020FF368
.extern UNK_020FF3D4
.extern UNK_020FFA38
.extern FX_SinCosTable_
.extern UNK_02105BB8
.extern UNK_021064BC
.extern UNK_021064C4
arm9/lib/src/FX_sincos.c
+4105
View File
File diff suppressed because it is too large Load Diff
arm9/modules/05/asm/mod05_021E3444.s
+5 -5
View File
@@ -1232,7 +1232,7 @@ MOD05_021E3DA0: ; 0x021E3DA0
bl MTX_Identity22_
add r0, sp, #8
ldrh r0, [r0, #0x14]
ldr r3, _021E3E0C ; =UNK_020FFA38
ldr r3, _021E3E0C ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -1271,7 +1271,7 @@ MOD05_021E3DA0: ; 0x021E3DA0
bl FUN_0200CA98
pop {r3, r4, r5, r6, r7, pc}
nop
_021E3E0C: .word UNK_020FFA38
_021E3E0C: .word FX_SinCosTable_
_021E3E10: .word MOD05_021E3D70
thumb_func_start MOD05_021E3E14
@@ -2286,7 +2286,7 @@ MOD05_021E45A0: ; 0x021E45A0
add r4, r1, #0
lsl r1, r0, #1
lsl r0, r1, #1
ldr r2, _021E4680 ; =UNK_020FFA38
ldr r2, _021E4680 ; =FX_SinCosTable_
add r1, r1, #1
lsl r1, r1, #1
ldrsh r0, [r2, r0]
@@ -2297,7 +2297,7 @@ MOD05_021E45A0: ; 0x021E45A0
asr r0, r4, #4
lsl r1, r0, #1
lsl r0, r1, #1
ldr r2, _021E4680 ; =UNK_020FFA38
ldr r2, _021E4680 ; =FX_SinCosTable_
add r1, r1, #1
lsl r1, r1, #1
ldrsh r0, [r2, r0]
@@ -2389,7 +2389,7 @@ _021E464C:
add sp, #0x20
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
_021E4680: .word UNK_020FFA38
_021E4680: .word FX_SinCosTable_
_021E4684: .word 0x00000000
thumb_func_start MOD05_021E4688
arm9/modules/05/asm/module_05.s
+10 -10
View File
@@ -15780,7 +15780,7 @@ _021F03A8:
asr r0, r1, #4
lsl r3, r0, #1
lsl r1, r3, #1
ldr r2, _021F0438 ; =UNK_020FFA38
ldr r2, _021F0438 ; =FX_SinCosTable_
add r3, r3, #1
lsl r3, r3, #1
ldrsh r1, [r2, r1]
@@ -15794,7 +15794,7 @@ _021F03A8:
asr r0, r5, #4
lsl r2, r0, #1
lsl r1, r2, #1
ldr r3, _021F0438 ; =UNK_020FFA38
ldr r3, _021F0438 ; =FX_SinCosTable_
add r2, r2, #1
lsl r2, r2, #1
ldrsh r1, [r3, r1]
@@ -15839,7 +15839,7 @@ _021F03A8:
pop {r4, r5, r6, r7, pc}
nop
_021F0434: .word UNK05_021F8B6C
_021F0438: .word UNK_020FFA38
_021F0438: .word FX_SinCosTable_
thumb_func_start MOD05_021F043C
MOD05_021F043C: ; 0x021F043C
@@ -15866,7 +15866,7 @@ MOD05_021F0454: ; 0x021F0454
bl FUN_0201F008
strh r0, [r5]
ldrh r0, [r5]
ldr r2, _021F04F0 ; =UNK_020FFA38
ldr r2, _021F04F0 ; =FX_SinCosTable_
asr r0, r0, #4
lsl r1, r0, #1
lsl r0, r1, #1
@@ -15909,7 +15909,7 @@ MOD05_021F0454: ; 0x021F0454
str r0, [r5, #0x1c]
add r0, sp, #0
ldrh r0, [r0]
ldr r3, _021F04F0 ; =UNK_020FFA38
ldr r3, _021F04F0 ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -15924,7 +15924,7 @@ MOD05_021F0454: ; 0x021F0454
add sp, #0x2c
pop {r4, r5, pc}
nop
_021F04F0: .word UNK_020FFA38
_021F04F0: .word FX_SinCosTable_
_021F04F4: .word UNK05_021F8B78
thumb_func_start MOD05_021F04F8
@@ -26373,7 +26373,7 @@ MOD05_021F5430: ; 0x021F5430
add r0, r4, #0
add r0, #0x70
ldrh r0, [r0]
ldr r3, _021F54C8 ; =UNK_020FFA38
ldr r3, _021F54C8 ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -26390,7 +26390,7 @@ MOD05_021F5430: ; 0x021F5430
add r0, r4, #0
add r0, #0x74
ldrh r0, [r0]
ldr r3, _021F54C8 ; =UNK_020FFA38
ldr r3, _021F54C8 ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -26407,7 +26407,7 @@ MOD05_021F5430: ; 0x021F5430
add r0, r4, #0
add r0, #0x72
ldrh r0, [r0]
ldr r3, _021F54C8 ; =UNK_020FFA38
ldr r3, _021F54C8 ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -26432,7 +26432,7 @@ _021F54C4:
add sp, #0x48
pop {r4, pc}
.balign 4, 0
_021F54C8: .word UNK_020FFA38
_021F54C8: .word FX_SinCosTable_
thumb_func_start MOD05_021F54CC
MOD05_021F54CC: ; 0x021F54CC
arm9/modules/08/asm/module_08.s
+14 -14
View File
@@ -12792,7 +12792,7 @@ _02217DA2:
ldr r2, [r4, #0xc]
asr r0, r0, #4
lsl r1, r0, #2
ldr r0, _02217E2C ; =UNK_020FFA38
ldr r0, _02217E2C ; =FX_SinCosTable_
asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
@@ -12813,7 +12813,7 @@ _02217DA2:
lsl r0, r0, #1
add r0, r0, #1
lsl r1, r0, #1
ldr r0, _02217E2C ; =UNK_020FFA38
ldr r0, _02217E2C ; =FX_SinCosTable_
asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
@@ -12834,7 +12834,7 @@ _02217E26:
mov r0, #0
pop {r4, pc}
nop
_02217E2C: .word UNK_020FFA38
_02217E2C: .word FX_SinCosTable_
thumb_func_start MOD08_02217E30
MOD08_02217E30: ; 0x02217E30
@@ -13221,7 +13221,7 @@ _022180CE:
lsl r0, r0, #1
add r0, r0, #1
lsl r1, r0, #1
ldr r0, _0221811C ; =UNK_020FFA38
ldr r0, _0221811C ; =FX_SinCosTable_
asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
@@ -13242,7 +13242,7 @@ _02218116:
mov r0, #0
pop {r4, pc}
nop
_0221811C: .word UNK_020FFA38
_0221811C: .word FX_SinCosTable_
thumb_func_start MOD08_02218120
MOD08_02218120: ; 0x02218120
@@ -38351,7 +38351,7 @@ _02224CA6:
mul r0, r1
asr r0, r0, #4
lsl r0, r0, #2
ldr r1, _02224D70 ; =UNK_020FFA38
ldr r1, _02224D70 ; =FX_SinCosTable_
str r0, [sp, #0x18]
add r1, r1, r0
mov r0, #2
@@ -38371,7 +38371,7 @@ _02224CA6:
lsl r0, r1, #4
asr r6, r0, #0x10
mov r2, #3
ldr r1, _02224D70 ; =UNK_020FFA38
ldr r1, _02224D70 ; =FX_SinCosTable_
ldr r0, [sp, #0x18]
lsl r2, r2, #0x10
ldrsh r0, [r1, r0]
@@ -38437,7 +38437,7 @@ _02224D50:
pop {r3, r4, r5, r6, r7, pc}
nop
_02224D6C: .word 0x00001555
_02224D70: .word UNK_020FFA38
_02224D70: .word FX_SinCosTable_
_02224D74: .word 0x00000000
_02224D78: .word MOD08_02224AF4
@@ -39693,7 +39693,7 @@ _022257C6:
lsr r0, r0, #0x10
asr r0, r0, #4
lsl r1, r0, #2
ldr r0, _0222586C ; =UNK_020FFA38
ldr r0, _0222586C ; =FX_SinCosTable_
ldr r3, [r6, #0x14]
ldrsh r0, [r0, r1]
lsl r2, r2, #0xc
@@ -39762,7 +39762,7 @@ _02225852:
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
nop
_0222586C: .word UNK_020FFA38
_0222586C: .word FX_SinCosTable_
_02225870: .word 0x00000132
_02225874: .word 0x00000000
_02225878: .word 0x00003FFF
@@ -40033,7 +40033,7 @@ MOD08_02225A70: ; 0x02225A70
lsr r0, r0, #0x10
asr r0, r0, #4
lsl r1, r0, #2
ldr r0, _02225B30 ; =UNK_020FFA38
ldr r0, _02225B30 ; =FX_SinCosTable_
lsl r2, r2, #0xc
ldrsh r0, [r0, r1]
mov r3, #0
@@ -40096,7 +40096,7 @@ _02225B2A:
add sp, #0xc
pop {r4, r5, r6, r7, pc}
.align 2, 0
_02225B30: .word UNK_020FFA38
_02225B30: .word FX_SinCosTable_
_02225B34: .word 0x00000000
_02225B38: .word 0x45800000
@@ -40407,7 +40407,7 @@ _02225D8C:
lsr r0, r0, #0x10
asr r0, r0, #4
lsl r1, r0, #2
ldr r0, _02225E0C ; =UNK_020FFA38
ldr r0, _02225E0C ; =FX_SinCosTable_
asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
@@ -40459,7 +40459,7 @@ _02225E02:
pop {r4, r5, r6, r7, pc}
nop
_02225E08: .word 0x00000199
_02225E0C: .word UNK_020FFA38
_02225E0C: .word FX_SinCosTable_
_02225E10: .word 0x00000000
thumb_func_start MOD08_02225E14
arm9/modules/16/asm/module_16.s
+5 -5
View File
@@ -29023,7 +29023,7 @@ _021E4ACE:
lsr r0, r0, #0x10
asr r0, r0, #4
lsl r1, r0, #2
ldr r0, _021E4B10 ; =UNK_020FFA38
ldr r0, _021E4B10 ; =FX_SinCosTable_
mov r2, #3
ldrsh r0, [r0, r1]
lsl r2, r2, #0x10
@@ -29044,7 +29044,7 @@ _021E4ACE:
pop {r3, pc}
.align 2, 0
_021E4B0C: .word 0x00007FFF
_021E4B10: .word UNK_020FFA38
_021E4B10: .word FX_SinCosTable_
thumb_func_end MOD16_021E4AC0
thumb_func_start MOD16_021E4B14
@@ -49298,7 +49298,7 @@ MOD16_021EE2A4: ; 0x021EE2A4
lsl r4, r0, #1
add r0, r4, #1
lsl r1, r0, #1
ldr r0, _021EE354 ; =UNK_020FFA38
ldr r0, _021EE354 ; =FX_SinCosTable_
mov r3, #0
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
@@ -49312,7 +49312,7 @@ MOD16_021EE2A4: ; 0x021EE2A4
lsr r5, r2, #0xc
orr r5, r0
mov r2, #0xe
ldr r0, _021EE354 ; =UNK_020FFA38
ldr r0, _021EE354 ; =FX_SinCosTable_
lsl r1, r4, #1
ldrsh r0, [r0, r1]
lsl r2, r2, #0xe
@@ -49364,7 +49364,7 @@ MOD16_021EE2A4: ; 0x021EE2A4
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_021EE354: .word UNK_020FFA38
_021EE354: .word FX_SinCosTable_
thumb_func_end MOD16_021EE2A4
thumb_func_start MOD16_021EE358
arm9/modules/17/asm/module_17.s
+2 -2
View File
@@ -1055,7 +1055,7 @@ MOD17_021D7C28: ; 0x021D7C28
mov r0, #0
str r0, [r1]
ldr r0, [sp]
ldr r1, _021D7CB4 ; =UNK_020FFA38
ldr r1, _021D7CB4 ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r0, r2, #1
@@ -1101,7 +1101,7 @@ _021D7CA0:
nop
_021D7CAC: .word 0x04000454
_021D7CB0: .word 0x04000470
_021D7CB4: .word UNK_020FFA38
_021D7CB4: .word FX_SinCosTable_
_021D7CB8: .word 0x0400046C
_021D7CBC: .word 0x04000448
thumb_func_end MOD17_021D7C28
arm9/modules/18/asm/module_18.s
+11 -11
View File
@@ -17178,7 +17178,7 @@ _02241A30:
lsl r2, r2, #0xa
asr r0, r0, #4
lsl r6, r0, #1
ldr r0, _02241AAC ; =UNK_020FFA38
ldr r0, _02241AAC ; =FX_SinCosTable_
lsl r1, r6, #1
ldrsh r0, [r0, r1]
mov r3, #0
@@ -17194,7 +17194,7 @@ _02241A30:
orr r4, r0
add r0, r6, #1
lsl r1, r0, #1
ldr r0, _02241AAC ; =UNK_020FFA38
ldr r0, _02241AAC ; =FX_SinCosTable_
mov r2, #0xa
ldrsh r0, [r0, r1]
lsl r2, r2, #0xa
@@ -17233,7 +17233,7 @@ _02241AA8:
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02241AAC: .word UNK_020FFA38
_02241AAC: .word FX_SinCosTable_
_02241AB0: .word MOD18_022513A0
thumb_func_end MOD18_02241A04
@@ -17478,7 +17478,7 @@ _02241C70:
ldr r2, [sp]
asr r0, r0, #4
lsl r1, r0, #2
ldr r0, _02241D34 ; =UNK_020FFA38
ldr r0, _02241D34 ; =FX_SinCosTable_
asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
@@ -17504,7 +17504,7 @@ _02241C70:
lsl r0, r0, #1
add r0, r0, #1
lsl r1, r0, #1
ldr r0, _02241D34 ; =UNK_020FFA38
ldr r0, _02241D34 ; =FX_SinCosTable_
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
bl _ll_mul
@@ -17561,7 +17561,7 @@ _02241D24: .word MOD18_02241AB4
_02241D28: .word MOD18_022513A0
_02241D2C: .word 0x00000B3B
_02241D30: .word 0x00000000
_02241D34: .word UNK_020FFA38
_02241D34: .word FX_SinCosTable_
thumb_func_end MOD18_02241AD0
thumb_func_start MOD18_02241D38
@@ -18343,7 +18343,7 @@ MOD18_02242320: ; 0x02242320
ldrh r0, [r2, r1]
asr r0, r0, #4
lsl r1, r0, #2
ldr r0, _022423AC ; =UNK_020FFA38
ldr r0, _022423AC ; =FX_SinCosTable_
ldrsh r1, [r0, r1]
mov r0, #1
lsl r0, r0, #0xc
@@ -18373,7 +18373,7 @@ _022423A4:
pop {r4, r5, pc}
.align 2, 0
_022423A8: .word MOD18_022513A0
_022423AC: .word UNK_020FFA38
_022423AC: .word FX_SinCosTable_
thumb_func_end MOD18_02242320
thumb_func_start MOD18_022423B0
@@ -18529,7 +18529,7 @@ _022424D4:
ldrh r0, [r4, #0x1c]
asr r0, r0, #4
lsl r1, r0, #2
ldr r0, _02242594 ; =UNK_020FFA38
ldr r0, _02242594 ; =FX_SinCosTable_
ldrsh r1, [r0, r1]
ldr r0, [r5, #0x48]
sub r0, r0, r1
@@ -18538,7 +18538,7 @@ _022424D4:
ldr r0, [r5, #0x44]
asr r1, r1, #4
lsl r2, r1, #2
ldr r1, _02242594 ; =UNK_020FFA38
ldr r1, _02242594 ; =FX_SinCosTable_
add r2, r1, r2
mov r1, #2
ldrsh r1, [r2, r1]
@@ -18616,7 +18616,7 @@ _02242584: .word 0x00000000
_02242588: .word MOD18_022500C0
_0224258C: .word 0x00000626
_02242590: .word MOD18_022513A0
_02242594: .word UNK_020FFA38
_02242594: .word FX_SinCosTable_
_02242598: .word 0x0000FFFF
thumb_func_end MOD18_022423B0
arm9/modules/20/asm/module_20.s
+3 -3
View File
@@ -3404,7 +3404,7 @@ _02253CEE:
add r0, #0x8c
ldrh r2, [r6, #0x10]
ldrh r0, [r0]
ldr r1, _02253E58 ; =UNK_020FFA38
ldr r1, _02253E58 ; =FX_SinCosTable_
add r0, r2, r0
lsl r0, r0, #0x10
lsr r0, r0, #0x10
@@ -3425,7 +3425,7 @@ _02253D20:
beq _02253D3E
asr r0, r0, #4
lsl r3, r0, #2
ldr r1, _02253E58 ; =UNK_020FFA38
ldr r1, _02253E58 ; =FX_SinCosTable_
ldr r0, [r4, #0x6c]
add r2, r1, r3
ldrsh r1, [r1, r3]
@@ -3574,7 +3574,7 @@ _02253E52:
add sp, #0x20
pop {r3, r4, r5, r6, r7, pc}
nop
_02253E58: .word UNK_020FFA38
_02253E58: .word FX_SinCosTable_
_02253E5C: .word 0xDFFFFFFF
_02253E60: .word 0xFFFFF3FF
_02253E64: .word 0xFFFF0FFF
arm9/modules/64/asm/module_64.s
+6 -6
View File
@@ -1149,7 +1149,7 @@ MOD64_021D7E34: ; 0x021D7E34
add r0, r4, #0
add r0, #0x90
ldrh r0, [r0]
ldr r3, _021D7ECC ; =UNK_020FFA38
ldr r3, _021D7ECC ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -1166,7 +1166,7 @@ MOD64_021D7E34: ; 0x021D7E34
add r0, r4, #0
add r0, #0x92
ldrh r0, [r0]
ldr r3, _021D7ECC ; =UNK_020FFA38
ldr r3, _021D7ECC ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -1183,7 +1183,7 @@ MOD64_021D7E34: ; 0x021D7E34
add r0, r4, #0
add r0, #0x94
ldrh r0, [r0]
ldr r3, _021D7ECC ; =UNK_020FFA38
ldr r3, _021D7ECC ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -1211,7 +1211,7 @@ _021D7EC8:
add sp, #0x48
pop {r4, pc}
.align 2, 0
_021D7ECC: .word UNK_020FFA38
_021D7ECC: .word FX_SinCosTable_
thumb_func_end MOD64_021D7E34
thumb_func_start MOD64_021D7ED0
@@ -2795,7 +2795,7 @@ MOD64_021D8A90: ; 0x021D8A90
lsr r0, r0, #0x10
asr r0, r0, #4
lsl r1, r0, #2
ldr r0, _021D8ADC ; =UNK_020FFA38
ldr r0, _021D8ADC ; =FX_SinCosTable_
ldr r2, [r4, #4]
ldrsh r0, [r0, r1]
asr r3, r2, #0x1f
@@ -2818,7 +2818,7 @@ MOD64_021D8A90: ; 0x021D8A90
pop {r4, pc}
nop
_021D8AD8: .word 0x0000FFFF
_021D8ADC: .word UNK_020FFA38
_021D8ADC: .word FX_SinCosTable_
thumb_func_end MOD64_021D8A90
thumb_func_start MOD64_021D8AE0
arm9/modules/69/asm/module_69.s
+7 -7
View File
@@ -3795,10 +3795,10 @@ _0222F408:
mov r1, #1
bl G3B_LightVector
ldrh r0, [r4, #0x28]
ldr r3, _0222F62C ; =UNK_020FFA38
ldr r3, _0222F62C ; =FX_SinCosTable_
asr r0, r0, #4
lsl r1, r0, #2
ldr r0, _0222F62C ; =UNK_020FFA38
ldr r0, _0222F62C ; =FX_SinCosTable_
add r2, r0, r1
ldrsh r1, [r3, r1]
mov r3, #2
@@ -3810,10 +3810,10 @@ _0222F408:
add r1, r5, #0
bl MTX_Concat44
ldrh r0, [r4, #0x2a]
ldr r3, _0222F62C ; =UNK_020FFA38
ldr r3, _0222F62C ; =FX_SinCosTable_
asr r0, r0, #4
lsl r1, r0, #2
ldr r0, _0222F62C ; =UNK_020FFA38
ldr r0, _0222F62C ; =FX_SinCosTable_
add r2, r0, r1
ldrsh r1, [r3, r1]
mov r3, #2
@@ -3825,10 +3825,10 @@ _0222F408:
add r1, r5, #0
bl MTX_Concat44
ldrh r0, [r4, #0x2c]
ldr r3, _0222F62C ; =UNK_020FFA38
ldr r3, _0222F62C ; =FX_SinCosTable_
asr r0, r0, #4
lsl r1, r0, #2
ldr r0, _0222F62C ; =UNK_020FFA38
ldr r0, _0222F62C ; =FX_SinCosTable_
add r2, r0, r1
ldrsh r1, [r3, r1]
mov r3, #2
@@ -3950,7 +3950,7 @@ _0222F61C: .word 0x0000019A
_0222F620: .word 0x00002D6B
_0222F624: .word 0x00000FFF
_0222F628: .word 0xFFFFF001
_0222F62C: .word UNK_020FFA38
_0222F62C: .word FX_SinCosTable_
_0222F630: .word 0x00007FFF
_0222F634: .word 0x00008D1C
_0222F638: .word 0x0000151C
arm9/modules/73/asm/module_73.s
+7 -7
View File
@@ -6738,7 +6738,7 @@ _021DA906:
str r0, [sp, #0x6c]
asr r0, r0, #0x1f
lsl r3, r2, #1
ldr r1, _021DAAA0 ; =UNK_020FFA38
ldr r1, _021DAAA0 ; =FX_SinCosTable_
str r0, [sp, #0x70]
ldr r0, [sp, #0xa8]
ldrsh r6, [r1, r3]
@@ -6904,7 +6904,7 @@ _021DA906:
pop {r3, r4, r5, r6, r7, pc}
nop
_021DAA9C: .word MOD73_021DBE7C
_021DAAA0: .word UNK_020FFA38
_021DAAA0: .word FX_SinCosTable_
_021DAAA4: .word 0x0000019A
thumb_func_end MOD73_021DA8BC
@@ -7130,7 +7130,7 @@ _021DABFC:
lsl r4, r0, #1
add r0, r4, #1
lsl r1, r0, #1
ldr r0, _021DAC98 ; =UNK_020FFA38
ldr r0, _021DAC98 ; =FX_SinCosTable_
add r2, r6, #0
ldrsh r0, [r0, r1]
add r3, r7, #0
@@ -7146,7 +7146,7 @@ _021DABFC:
lsr r0, r0, #0xc
orr r0, r1
str r0, [sp]
ldr r0, _021DAC98 ; =UNK_020FFA38
ldr r0, _021DAC98 ; =FX_SinCosTable_
lsl r1, r4, #1
ldrsh r0, [r0, r1]
add r2, r6, #0
@@ -7177,7 +7177,7 @@ _021DAC94:
add sp, #0xc
pop {r4, r5, r6, r7, pc}
.align 2, 0
_021DAC98: .word UNK_020FFA38
_021DAC98: .word FX_SinCosTable_
thumb_func_end MOD73_021DABD0
thumb_func_start MOD73_021DAC9C
@@ -7706,7 +7706,7 @@ MOD73_021DB020: ; 0x021DB020
asr r0, r0, #4
lsl r1, r0, #1
add r0, r1, #1
ldr r7, _021DB124 ; =UNK_020FFA38
ldr r7, _021DB124 ; =FX_SinCosTable_
lsl r0, r0, #1
ldrsh r3, [r7, r0]
asr r6, r3, #0x1f
@@ -7819,7 +7819,7 @@ _021DB112:
add sp, #0x1c
pop {r4, r5, r6, r7, pc}
nop
_021DB124: .word UNK_020FFA38
_021DB124: .word FX_SinCosTable_
_021DB128: .word 0x00000000
thumb_func_end MOD73_021DB020
arm9/modules/77/asm/module_77.s
+8 -8
View File
@@ -2567,7 +2567,7 @@ MOD77_021D8A30: ; 0x021D8A30
sub sp, #0x24
add r4, r1, #0
ldr r1, [r4, #4]
ldr r3, _021D8AA4 ; =UNK_020FFA38
ldr r3, _021D8AA4 ; =FX_SinCosTable_
lsl r1, r1, #0x10
lsr r1, r1, #0x10
asr r1, r1, #4
@@ -2580,7 +2580,7 @@ MOD77_021D8A30: ; 0x021D8A30
add r5, r0, #0
bl MTX_RotY33_
ldr r0, [r4]
ldr r3, _021D8AA4 ; =UNK_020FFA38
ldr r3, _021D8AA4 ; =FX_SinCosTable_
lsl r0, r0, #0x10
lsr r0, r0, #0x10
asr r0, r0, #4
@@ -2597,7 +2597,7 @@ MOD77_021D8A30: ; 0x021D8A30
add r2, r5, #0
bl MTX_Concat33
ldr r0, [r4, #8]
ldr r3, _021D8AA4 ; =UNK_020FFA38
ldr r3, _021D8AA4 ; =FX_SinCosTable_
lsl r0, r0, #0x10
lsr r0, r0, #0x10
asr r0, r0, #4
@@ -2616,7 +2616,7 @@ MOD77_021D8A30: ; 0x021D8A30
add sp, #0x24
pop {r4, r5, pc}
nop
_021D8AA4: .word UNK_020FFA38
_021D8AA4: .word FX_SinCosTable_
thumb_func_end MOD77_021D8A30
thumb_func_start MOD77_021D8AA8
@@ -2625,7 +2625,7 @@ MOD77_021D8AA8: ; 0x021D8AA8
sub sp, #0x24
add r4, r1, #0
ldr r1, [r4]
ldr r3, _021D8B1C ; =UNK_020FFA38
ldr r3, _021D8B1C ; =FX_SinCosTable_
lsl r1, r1, #0x10
lsr r1, r1, #0x10
asr r1, r1, #4
@@ -2638,7 +2638,7 @@ MOD77_021D8AA8: ; 0x021D8AA8
add r5, r0, #0
bl MTX_RotY33_
ldr r0, [r4, #4]
ldr r3, _021D8B1C ; =UNK_020FFA38
ldr r3, _021D8B1C ; =FX_SinCosTable_
neg r0, r0
lsl r0, r0, #0x10
lsr r0, r0, #0x10
@@ -2656,7 +2656,7 @@ MOD77_021D8AA8: ; 0x021D8AA8
add r2, r5, #0
bl MTX_Concat33
ldr r0, [r4, #8]
ldr r3, _021D8B1C ; =UNK_020FFA38
ldr r3, _021D8B1C ; =FX_SinCosTable_
lsl r0, r0, #0x10
lsr r0, r0, #0x10
asr r0, r0, #4
@@ -2675,7 +2675,7 @@ MOD77_021D8AA8: ; 0x021D8AA8
add sp, #0x24
pop {r4, r5, pc}
.align 2, 0
_021D8B1C: .word UNK_020FFA38
_021D8B1C: .word FX_SinCosTable_
thumb_func_end MOD77_021D8AA8
thumb_func_start MOD77_021D8B20
arm9/modules/81/asm/module_81.s
+8 -8
View File
@@ -1520,7 +1520,7 @@ MOD81_02238988: ; 0x02238988
add r0, r4, #0
add r0, #0x80
ldrh r0, [r0]
ldr r3, _02238A34 ; =UNK_020FFA38
ldr r3, _02238A34 ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -1537,7 +1537,7 @@ MOD81_02238988: ; 0x02238988
add r0, r4, #0
add r0, #0x82
ldrh r0, [r0]
ldr r3, _02238A34 ; =UNK_020FFA38
ldr r3, _02238A34 ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -1554,7 +1554,7 @@ MOD81_02238988: ; 0x02238988
add r0, r4, #0
add r0, #0x84
ldrh r0, [r0]
ldr r3, _02238A34 ; =UNK_020FFA38
ldr r3, _02238A34 ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -1591,7 +1591,7 @@ _02238A20:
add sp, #0x50
pop {r4, pc}
.align 2, 0
_02238A34: .word UNK_020FFA38
_02238A34: .word FX_SinCosTable_
thumb_func_end MOD81_02238988
thumb_func_start MOD81_02238A38
@@ -1806,7 +1806,7 @@ MOD81_02238B8C: ; 0x02238B8C
add r0, r4, #0
add r0, #0x80
ldrh r0, [r0]
ldr r3, _02238C3C ; =UNK_020FFA38
ldr r3, _02238C3C ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -1823,7 +1823,7 @@ MOD81_02238B8C: ; 0x02238B8C
add r0, r4, #0
add r0, #0x82
ldrh r0, [r0]
ldr r3, _02238C3C ; =UNK_020FFA38
ldr r3, _02238C3C ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -1840,7 +1840,7 @@ MOD81_02238B8C: ; 0x02238B8C
add r0, r4, #0
add r0, #0x84
ldrh r0, [r0]
ldr r3, _02238C3C ; =UNK_020FFA38
ldr r3, _02238C3C ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -1876,7 +1876,7 @@ MOD81_02238B8C: ; 0x02238B8C
add sp, #0x4c
pop {r3, r4, pc}
.align 2, 0
_02238C3C: .word UNK_020FFA38
_02238C3C: .word FX_SinCosTable_
thumb_func_end MOD81_02238B8C
thumb_func_start MOD81_02238C40
arm9/modules/84/asm/module_84_thumb1.s
+4 -4
View File
@@ -1010,7 +1010,7 @@ MOD84_021D7CFC: ; 0x021D7CFC
add r0, r4, #0
add r0, #0x94
ldrh r0, [r0]
ldr r3, _021D7DF0 ; =UNK_020FFA38
ldr r3, _021D7DF0 ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -1027,7 +1027,7 @@ MOD84_021D7CFC: ; 0x021D7CFC
add r0, r4, #0
add r0, #0x96
ldrh r0, [r0]
ldr r3, _021D7DF0 ; =UNK_020FFA38
ldr r3, _021D7DF0 ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -1044,7 +1044,7 @@ MOD84_021D7CFC: ; 0x021D7CFC
add r0, r4, #0
add r0, #0x98
ldrh r0, [r0]
ldr r3, _021D7DF0 ; =UNK_020FFA38
ldr r3, _021D7DF0 ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -1105,7 +1105,7 @@ _021D7DBA:
add sp, #0x4c
pop {r3, r4, pc}
nop
_021D7DF0: .word UNK_020FFA38
_021D7DF0: .word FX_SinCosTable_
thumb_func_end MOD84_021D7CFC
thumb_func_start MOD84_021D7DF4
arm9/src/math_util.c
+3 -3
View File
@@ -1,7 +1,7 @@
#include "global.h"
#include "math_util.h"
extern const s16 UNK_020FFA38[]; // temporary until further notice
extern const s16 FX_SinCosTable_[]; // temporary until further notice
/*
* Constant tables
@@ -697,8 +697,8 @@ THUMB_FUNC void MTX22_2DAffine(struct Mtx22 * mtx, u16 radians, fx32 x, fx32 y,
radians = (u16)((u32)(radians * 65535) / 360); // shut up the compiler
MTX_Rot22_(mtx,
UNK_020FFA38[((radians >> 4) * 2)], // TODO: macros
UNK_020FFA38[((radians >> 4) * 2) + 1]); // TODO: macros
FX_SinCosTable_[((radians >> 4) * 2)], // TODO: macros
FX_SinCosTable_[((radians >> 4) * 2) + 1]); // TODO: macros
MTX_ScaleApply22(mtx, mtx, x, y);
}