Game-Decompilation/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2025-02-09 14:42:20 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename NitroSDK methods in libfx.a

Browse Source
This commit is contained in:
PikalaxALT 2021-08-19 14:13:23 -04:00
parent 41d48f8763
commit 75c4fbb08c
46 changed files with 1128 additions and 1103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/game_init.s
View File

@ -211,7 +211,7 @@ _0201A1FC: .word 0x020F62A4
InitSystemForTheGame: ; 0x0201A200
push {r3, r4, r5, lr}
bl sub_020D290C
bl sub_020CD784
bl FX_Init
ldr r2, _0201A324 ; =0x04000304
ldr r0, _0201A328 ; =0xFFFFFDF1
ldrh r1, [r2]

54
asm/overlay_01.s
View File

@ -13923,7 +13923,7 @@ ov01_021EC31C: ; 0x021EC31C
mov r1, #3
lsl r0, r0, #0xe
lsl r1, r1, #0xc
bl sub_020CCBA0
bl FX_Div
add r7, r0, #0
mov r0, #0x41
ldr r1, [r5]
@ -13948,18 +13948,18 @@ ov01_021EC31C: ; 0x021EC31C
mov r1, #1
ldr r0, [sp, #0x14]
lsl r1, r1, #0x14
bl sub_020CCBA0
bl FX_Div
str r0, [sp, #0x14]
cmp r4, #0
bgt _021EC398
ldr r0, [sp, #0x10]
ldr r1, _021EC464 ; =0x000BE8D0
bl sub_020CCBA0
bl FX_Div
b _021EC3A0
_021EC398:
ldr r0, [sp, #0x10]
ldr r1, _021EC468 ; =0x000BE811
bl sub_020CCBA0
bl FX_Div
_021EC3A0:
mov r7, #1
lsl r7, r7, #0xc
@ -13983,7 +13983,7 @@ _021EC3A0:
_021EC3C8:
ldr r1, [sp, #0x14]
add r0, r6, #0
bl sub_020CCBA0
bl FX_Div
add r6, r0, #0
cmp r7, #0
bge _021EC3F0
@ -14021,7 +14021,7 @@ _021EC3F0:
_021EC416:
ldr r1, [sp, #0x10]
add r0, r4, #0
bl sub_020CCBA0
bl FX_Div
add r3, r0, #0
cmp r7, #0
bge _021EC43E
@ -21657,7 +21657,7 @@ ov01_021EFE80: ; 0x021EFE80
orr r0, r1
ldr r1, [r4, #0x10]
lsl r1, r1, #0xc
bl sub_020CCBA0
bl FX_Div
ldr r1, [r4, #4]
add r0, r0, r1
str r0, [r4]
@ -21713,7 +21713,7 @@ ov01_021EFEC8: ; 0x021EFEC8
add r1, r4, #0
mul r1, r4
lsl r1, r1, #0xc
bl sub_020CCBA0
bl FX_Div
str r6, [r5]
ldr r1, [sp]
str r6, [r5, #4]
@ -21760,7 +21760,7 @@ ov01_021EFF28: ; 0x021EFF28
lsr r0, r0, #0xc
orr r0, r1
lsl r1, r2, #2
bl sub_020CCBA0
bl FX_Div
ldr r1, [r5, #4]
add r0, r4, r0
add r0, r1, r0
@ -24130,14 +24130,14 @@ ov01_021F10C8: ; 0x021F10C8
ldr r0, [r3]
str r0, [r2]
add r0, sp, #0
bl sub_020CAFEC
bl MTX_Identity33_
add r0, sp, #0x30
bl sub_020BEFD4
add r0, sp, #0x24
bl sub_020BF004
ldr r1, _021F1140 ; =0x021DA558
add r0, sp, #0
bl sub_020D4928
bl MI_Copy36B
ldr r1, _021F1144 ; =0x021DA51C
mov r0, #0xa4
ldr r2, [r1, #0x7c]
@ -24208,7 +24208,7 @@ _021F1154:
mov r1, #1
bl sub_02022C60
add r0, sp, #0x24
bl sub_020CAF70
bl MTX_Identity22_
mov r2, #0
str r2, [sp]
ldr r0, _021F1208 ; =0x04000030
@ -29873,7 +29873,7 @@ ov01_021F3B84: ; 0x021F3B84
bl sub_020BEFD4
ldr r1, _021F3C04 ; =0x021DA558
add r0, r4, #0
bl sub_020D4928
bl MI_Copy36B
ldr r1, _021F3C08 ; =0x021DA51C
mov r0, #0xa4
ldr r2, [r1, #0x7c]
@ -45497,7 +45497,7 @@ _021FAEB0:
add r0, r0, r1
ldr r1, [sp, #0x3c]
neg r0, r0
bl sub_020CCBA0
bl FX_Div
str r0, [r7]
add r4, r4, #1
add r7, #0xc
@ -47784,7 +47784,7 @@ ov01_021FBF68: ; 0x021FBF68
cmp r0, #0
beq _021FBFFC
add r0, sp, #0x24
bl sub_020CAFEC
bl MTX_Identity33_
add r0, r4, #0
add r0, #0x70
ldrh r0, [r0]
@ -47797,11 +47797,11 @@ ov01_021FBF68: ; 0x021FBF68
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB0D0
bl MTX_RotX33_
add r1, sp, #0x24
add r0, sp, #0
add r2, r1, #0
bl sub_020CB410
bl MTX_Concat33
add r0, r4, #0
add r0, #0x74
ldrh r0, [r0]
@ -47814,11 +47814,11 @@ ov01_021FBF68: ; 0x021FBF68
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB108
bl MTX_RotZ33_
add r1, sp, #0x24
add r0, sp, #0
add r2, r1, #0
bl sub_020CB410
bl MTX_Concat33
add r0, r4, #0
add r0, #0x72
ldrh r0, [r0]
@ -47831,11 +47831,11 @@ ov01_021FBF68: ; 0x021FBF68
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB0EC
bl MTX_RotY33_
add r1, sp, #0x24
add r0, sp, #0
add r2, r1, #0
bl sub_020CB410
bl MTX_Concat33
add r1, r4, #0
add r0, r4, #0
add r4, #0x60
@ -57252,7 +57252,7 @@ ov01_02200540: ; 0x02200540
add r0, sp, #0x14
add r1, sp, #8
add r2, r0, #0
bl sub_020CCD78
bl VEC_Add
add r0, r5, #0
bl sub_0205F538
add r1, r0, #1
@ -63959,7 +63959,7 @@ _02203A6E:
add r0, sp, #0x14
add r1, sp, #8
add r2, r0, #0
bl sub_020CCD78
bl VEC_Add
add r0, r5, #0
bl sub_0205F538
add r1, r0, #1
@ -64512,17 +64512,17 @@ ov01_02203EA0: ; 0x02203EA0
add r0, sp, #8
add r1, sp, #0x14
add r2, sp, #0x3c
bl sub_020CCDAC
bl VEC_Subtract
add r0, sp, #8
add r1, sp, #0x14
bl sub_020CD280
bl VEC_Distance
str r0, [sp, #0x38]
mov r1, #3
bl _s32_div_f
str r0, [sp, #0x38]
add r0, sp, #0x3c
add r1, r0, #0
bl sub_020CCFE0
bl VEC_Normalize
add r0, r5, #0
add r1, sp, #0x20
bl sub_0205F944
@ -64603,7 +64603,7 @@ ov01_02203F6C: ; 0x02203F6C
add r1, r4, #0
add r2, sp, #0xc
add r3, sp, #0
bl sub_020CD224
bl VEC_MultAdd
add r0, r5, #0
add r1, sp, #0
bl sub_02068DA8

10
asm/overlay_02.s
View File

@ -1327,7 +1327,7 @@ _022465D8:
add r1, r0, #0
mov r0, #0x5a
lsl r0, r0, #0xe
bl sub_020CCBA0
bl FX_Div
str r0, [r5, #0x14]
ldr r0, [r5, #4]
ldr r1, [r5, #0x18]
@ -7545,7 +7545,7 @@ ov02_022494C4: ; 0x022494C4
sub r0, r1, r0
mov r1, #2
lsl r1, r1, #0xc
bl sub_020CCBA0
bl FX_Div
mov r1, #0xbb
lsl r1, r1, #2
ldr r2, [r4, r1]
@ -25542,7 +25542,7 @@ _02251D1A:
add r1, r0, #0
add r0, sp, #0x14
add r2, #0xc
bl sub_020CCDAC
bl VEC_Subtract
ldr r0, [r5, #0x24]
bl sub_0202360C
strh r0, [r4, #0x18]
@ -26928,11 +26928,11 @@ ov02_022527B0: ; 0x022527B0
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0x10
bl sub_020CB108
bl MTX_RotZ33_
add r0, sp, #4
add r1, sp, #0x10
add r2, sp, #0x34
bl sub_020CB630
bl MTX_MultVec33
ldr r1, [sp]
add r0, sp, #0x34
bl sub_02023204

20
asm/overlay_04.s
View File

@ -1344,7 +1344,7 @@ _022548C6:
add r0, r4, #0
add r0, #0x38
add r1, r0, #0
bl sub_020CCFE0
bl VEC_Normalize
ldr r2, _02254BA4 ; =0x02257350
add r3, sp, #0x8c
ldmia r2!, {r0, r1}
@ -1355,7 +1355,7 @@ _022548C6:
str r0, [r3]
add r0, r4, #0
add r0, #0x38
bl sub_020CCE14
bl VEC_DotProduct
str r0, [sp, #0x34]
add r1, r4, #0
add r1, #0x38
@ -1367,7 +1367,7 @@ _022548C6:
mov r0, #2
lsl r0, r0, #0xc
add r3, r1, #0
bl sub_020CD224
bl VEC_MultAdd
ldr r0, [r4, #0x1c]
cmp r0, #0
bne _0225494A
@ -1489,7 +1489,7 @@ _02254A14:
add r1, r4, #0
add r1, #0x38
add r2, r0, #0
bl sub_020CCD78
bl VEC_Add
_02254A22:
ldrb r1, [r4, #0x17]
add r0, r5, #0
@ -1535,7 +1535,7 @@ _02254A22:
add r1, r7, #0
str r0, [r3]
add r0, r2, #0
bl sub_020CCD78
bl VEC_Add
mov r0, #0x1b
ldrsb r0, [r4, r0]
ldr r1, [sp, #0x70]
@ -1567,7 +1567,7 @@ _02254AA6:
add r1, r7, #0
str r0, [r3]
add r0, r2, #0
bl sub_020CCD78
bl VEC_Add
ldr r1, [sp, #0x58]
lsl r0, r6, #0x10
add r0, r1, r0
@ -4121,7 +4121,7 @@ _02255DEA:
add r1, r4, #0
add r1, #0x58
add r2, r0, #0
bl sub_020CCD78
bl VEC_Add
ldr r0, [sp]
add r1, sp, #0x34
bl ov01_021F3B1C
@ -4134,7 +4134,7 @@ _02255DEA:
add r1, r4, #0
add r1, #0x58
add r2, r0, #0
bl sub_020CCD78
bl VEC_Add
add r0, r6, #0
add r1, sp, #0x28
bl sub_0205F954
@ -4265,7 +4265,7 @@ _02255F1C:
add r1, r4, #0
add r1, #0x58
add r2, r0, #0
bl sub_020CCD78
bl VEC_Add
add r0, r5, #0
add r1, sp, #0x10
bl ov01_021F3B1C
@ -4278,7 +4278,7 @@ _02255F1C:
add r1, r4, #0
add r1, #0x58
add r2, r0, #0
bl sub_020CCD78
bl VEC_Add
add r0, r5, #0
add r1, sp, #4
bl sub_0205F954

18
asm/overlay_07.s
View File

@ -13432,12 +13432,12 @@ _0222203A:
thumb_func_start ov07_02222040
ov07_02222040: ; 0x02222040
ldr r3, _02222048 ; =sub_020CCBA0
ldr r3, _02222048 ; =FX_Div
sub r0, r1, r0
lsl r1, r2, #0xc
bx r3
.balign 4, 0
_02222048: .word sub_020CCBA0
_02222048: .word FX_Div
thumb_func_end ov07_02222040
thumb_func_start ov07_0222204C
@ -13445,10 +13445,10 @@ ov07_0222204C: ; 0x0222204C
push {r3, lr}
sub r0, r1, r0
add r1, r2, #0
bl sub_020CCBA0
bl FX_Div
add r1, sp, #0
str r0, [sp]
bl sub_020CD788
bl FX_Modf
cmp r0, #0
beq _0222206C
mov r0, #1
@ -14324,10 +14324,10 @@ ov07_02222674: ; 0x02222674
lsr r0, r0, #0xc
orr r0, r1
lsl r1, r2, #9
bl sub_020CCBA0
bl FX_Div
sub r0, r4, r0
add r1, sp, #0
bl sub_020CD788
bl FX_Modf
cmp r0, #0
beq _022226B2
mov r1, #2
@ -15385,7 +15385,7 @@ ov07_02222DE4: ; 0x02222DE4
mul r1, r0
add r0, r2, r1
lsl r0, r0, #0xc
bl sub_020CCBEC
bl FX_Sqrt
ldr r1, [sp, #8]
str r0, [r1]
pop {r3, pc}
@ -15405,7 +15405,7 @@ ov07_02222E0C: ; 0x02222E0C
ldr r5, [sp, #0x10]
lsl r0, r4, #0xc
asr r1, r1, #4
bl sub_020CD5DC
bl FX_Atan2Idx
strh r0, [r5]
ldrh r1, [r5]
cmp r1, #0
@ -50477,7 +50477,7 @@ ov07_022344E4: ; 0x022344E4
mul r1, r0
add r0, r2, r1
lsl r0, r0, #0xc
bl sub_020CCBEC
bl FX_Sqrt
asr r1, r0, #0xb
lsr r1, r1, #0x14
add r1, r0, r1

12
asm/overlay_101.s
View File

@ -4123,7 +4123,7 @@ _021E97BC:
bl _ftoi
add r1, r0, #0
add r0, r6, #0
bl sub_020CCBA0
bl FX_Div
add r1, r4, #0
add r1, #0xe0
str r0, [r1]
@ -4170,7 +4170,7 @@ _021E9828:
bl _ftoi
add r1, r0, #0
add r0, r6, #0
bl sub_020CCBA0
bl FX_Div
add r4, #0xe4
str r0, [r4]
add sp, #0x18
@ -4591,10 +4591,10 @@ ov101_021E9B70: ; 0x021E9B70
add r6, r1, #0
add r4, r0, #0
ldr r0, [r6, #8]
bl sub_020CCBB0
bl FX_Inv
add r5, r0, #0
ldr r0, [r6, #0xc]
bl sub_020CCBB0
bl FX_Inv
str r5, [sp, #4]
mov r5, #0
str r5, [sp, #8]
@ -10198,7 +10198,7 @@ _021EC682:
bl _ftoi
add r1, r0, #0
ldr r0, [sp, #0x24]
bl sub_020CCBA0
bl FX_Div
str r0, [r5, #0x18]
ldr r0, _021EC774 ; =0x0000013A
ldrb r0, [r6, r0]
@ -10243,7 +10243,7 @@ _021EC6EA:
bl _ftoi
add r1, r0, #0
ldr r0, [sp, #0x28]
bl sub_020CCBA0
bl FX_Div
str r0, [r5, #0x1c]
mov r0, #6
ldrsh r0, [r5, r0]

2
asm/overlay_108.s
View File

@ -7115,7 +7115,7 @@ _021E916C:
str r0, [sp, #4]
str r0, [sp, #8]
add r0, sp, #0x18
bl sub_020CAFEC
bl MTX_Identity33_
add r6, #0x10
add r0, r6, #0
add r1, sp, #0xc

4
asm/overlay_109.s
View File

@ -2112,12 +2112,12 @@ ov109_021E68D4: ; 0x021E68D4
str r0, [sp, #0xc]
mov r0, #1
lsl r0, r0, #0xc
bl sub_020CCBB0
bl FX_Inv
str r0, [sp, #0x10]
mov r0, #0x1f
lsl r0, r0, #4
ldr r0, [r4, r0]
bl sub_020CCBB0
bl FX_Inv
str r0, [sp, #4]
mov r0, #0x78
str r0, [sp]

2
asm/overlay_12.s
View File

@ -100459,7 +100459,7 @@ ov12_02268520: ; 0x02268520
add r1, r4, r1
asr r5, r1, #3
mov r1, #8
bl sub_020CCD3C
bl FX_ModS32
cmp r0, #0
beq _02268548
add r5, r5, #1

76
asm/overlay_13_arm_2.s
View File

@ -88,14 +88,14 @@ ov13_02227064: ; 0x02227064
ldr r0, [r0]
ldrb r0, [r0, #9]
add r0, r0, #1
bl sub_020CCD3C
bl FX_ModS32
ldr r2, _02227124 ; =0x0224F464
mov r1, #5
ldr r3, [r2]
strb r0, [r3, #9]
ldr r0, [r2]
ldrb r0, [r0, #9]
bl sub_020CCD00
bl FX_DivS32
ldr r2, _02227124 ; =0x0224F464
add r1, r0, #0x47
ldr r2, [r2]
@ -2625,7 +2625,7 @@ _0222920C:
_0222924C:
add r0, sl, #3
mov r1, #4
bl sub_020CCD3C
bl FX_ModS32
add r3, sp, #0xd
ldrb r1, [r3, sl]
mov r5, #0
@ -5259,7 +5259,7 @@ _0222B590:
_0222B5A0:
mov r0, #0
bl sub_020CD944
bl sub_020CD784
bl FX_Init
mvn r0, #0
bl sub_020D7F60
bl sub_020D9EF0
@ -8214,14 +8214,14 @@ ov13_0222DAB0: ; 0x0222DAB0
ldr r0, _0222DB2C ; =0x0224F508
ldrb r0, [r0]
add r0, r0, #2
bl sub_020CCD3C
bl FX_ModS32
ldr r1, _0222DB2C ; =0x0224F508
b _0222DAEC
_0222DAD8:
ldr r0, _0222DB2C ; =0x0224F508
ldrb r0, [r0]
add r0, r0, #1
bl sub_020CCD3C
bl FX_ModS32
ldr r1, _0222DB2C ; =0x0224F508
_0222DAEC:
strb r0, [r1]
@ -11045,7 +11045,7 @@ _0222FCC8:
ldrb r0, [r1, #0x53]
ldrh r1, [r1, #0x40]
mul r0, r2, r0
bl sub_020CCD00
bl FX_DivS32
_0222FCEC:
str r0, [sp]
mov r0, r4
@ -11448,7 +11448,7 @@ _02230214:
ldrh r2, [r1, #0x40]
ldrb r1, [r1, #0x53]
mul r0, r2, r0
bl sub_020CCD00
bl FX_DivS32
ldr r1, _02230408 ; =0x0224F538
strh r0, [r1, #2]
bl ov13_022307AC
@ -11469,7 +11469,7 @@ _02230268:
ldrh r2, [r1, #0x40]
ldrb r1, [r1, #0x53]
mul r0, r2, r0
bl sub_020CCD00
bl FX_DivS32
ldr r1, _02230408 ; =0x0224F538
strh r0, [r1, #2]
mov r0, #0x13
@ -11478,7 +11478,7 @@ _02230268:
ldr r0, _02230408 ; =0x0224F538
mov r1, #0x1c
ldrh r0, [r0, #2]
bl sub_020CCD3C
bl FX_ModS32
cmp r0, #0
bne _022302CC
bl ov13_02230CC4
@ -11611,7 +11611,7 @@ _02230458:
_02230484:
ldrh r0, [r0, #2]
mov r1, #0x1c
bl sub_020CCD00
bl FX_DivS32
ldr r2, _02230514 ; =0x0224F538
mov r1, #0x2a
ldrb lr, [r2]
@ -11846,7 +11846,7 @@ ov13_022307AC: ; 0x022307AC
ldr r0, _02230850 ; =0x0224F538
mov r1, #0x1c
ldrh r0, [r0, #2]
bl sub_020CCD00
bl FX_DivS32
ldr r1, _02230850 ; =0x0224F538
mov r7, r0
ldr r0, [r1, #4]
@ -12040,7 +12040,7 @@ ov13_02230A58: ; 0x02230A58
ldr r0, _02230B0C ; =0x0224F538
mov r1, #0x1c
ldrh r0, [r0, #2]
bl sub_020CCD3C
bl FX_ModS32
ldr r1, _02230B0C ; =0x0224F538
rsb r0, r0, #0x36
ldr r1, [r1, #4]
@ -12103,7 +12103,7 @@ ov13_02230B14: ; 0x02230B14
ldr r0, _02230BCC ; =0x0224F538
mov r1, #0x1c
ldrh r0, [r0, #2]
bl sub_020CCD3C
bl FX_ModS32
mov r5, r0
cmp r5, #0x18
bne _02230B60
@ -12127,7 +12127,7 @@ _02230B7C:
ldrb r0, [r1, #0x53]
ldrh r1, [r1, #0x40]
mul r0, r2, r0
bl sub_020CCD00
bl FX_DivS32
bl ov13_02239578
bl ov13_02239584
bl ov13_02230CC4
@ -12154,7 +12154,7 @@ ov13_02230BD0: ; 0x02230BD0
add r2, r2, #4
strh r2, [r0, #2]
ldrh r0, [r0, #2]
bl sub_020CCD3C
bl FX_ModS32
cmp r0, #4
blt _02230C0C
bl ov13_02230A58
@ -12171,7 +12171,7 @@ _02230C0C:
ldrb r0, [r1, #0x53]
ldrh r1, [r1, #0x40]
mul r0, r2, r0
bl sub_020CCD00
bl FX_DivS32
bl ov13_02239578
bl ov13_02239584
bl ov13_02230CC4
@ -12196,7 +12196,7 @@ ov13_02230C68: ; 0x02230C68
ldmeqia sp!, {r3, pc}
ldrh r0, [r0, #2]
mov r1, #0x1c
bl sub_020CCD3C
bl FX_ModS32
ldr r1, _02230CBC ; =0x01FF0000
sub r0, r0, #0x32
ldr r2, _02230CC0 ; =0x04000010
@ -15543,7 +15543,7 @@ _022338D0:
ldr r0, _02233A5C ; =0x0224F54C
mov r1, #0x1d
ldrh r0, [r0, #4]
bl sub_020CCD3C
bl FX_ModS32
cmp r0, #0
bne _02233930
bl ov13_02234CA4
@ -15888,7 +15888,7 @@ ov13_02233DCC: ; 0x02233DCC
ldr r0, _02233E84 ; =0x0224F54C
mov r1, #0x1d
ldrh r0, [r0, #4]
bl sub_020CCD00
bl FX_DivS32
ldr r1, _02233E84 ; =0x0224F54C
mov r4, r0
ldr r0, [r1, #8]
@ -16417,12 +16417,12 @@ ov13_022344F0: ; 0x022344F0
ldr r0, _022346F4 ; =0x0224F54C
mov r1, #0x1d
ldrh r0, [r0, #4]
bl sub_020CCD00
bl FX_DivS32
ldr r1, _022346F4 ; =0x0224F54C
mov r4, r0
ldrh r0, [r1, #4]
mov r1, #0x1d
bl sub_020CCD3C
bl FX_ModS32
ldr r1, _022346F4 ; =0x0224F54C
rsb ip, r0, #0x34
ldr r1, [r1, #8]
@ -16566,7 +16566,7 @@ ov13_02234700: ; 0x02234700
ldr r0, _02234964 ; =0x0224F54C
mov r1, #0x1d
ldrh r0, [r0, #4]
bl sub_020CCD00
bl FX_DivS32
ldr r1, _02234968 ; =0x022454FC
mov r5, r0
ldrh r3, [r1, #4]
@ -16601,7 +16601,7 @@ _02234788:
ldr r0, _02234964 ; =0x0224F54C
mov r1, #0x1d
ldrh r0, [r0, #4]
bl sub_020CCD00
bl FX_DivS32
mov r3, #0
_022347B8:
cmp r0, #2
@ -16652,7 +16652,7 @@ _02234864:
ldr r0, _02234964 ; =0x0224F54C
mov r1, #0x1d
ldrh r0, [r0, #4]
bl sub_020CCD00
bl FX_DivS32
mov r3, #0
_02234878:
cmp r0, #6
@ -16731,7 +16731,7 @@ ov13_02234974: ; 0x02234974
mov r4, r0
ldrh r0, [r1, #4]
mov r1, #0x1d
bl sub_020CCD00
bl FX_DivS32
mov r1, #0
_02234990:
cmp r0, r4
@ -16754,7 +16754,7 @@ ov13_022349B8: ; 0x022349B8
mov r4, r0
ldrh r0, [r1, #4]
mov r1, #0x1d
bl sub_020CCD00
bl FX_DivS32
add r0, r0, r4
ldmia sp!, {r4, pc}
.balign 4, 0
@ -16776,7 +16776,7 @@ ov13_022349DC: ; 0x022349DC
ldr r0, _02234A9C ; =0x0224F54C
mov r1, #0x1d
ldrh r0, [r0, #4]
bl sub_020CCD3C
bl FX_ModS32
mov r5, r0
cmp r5, #0x17
bne _02234A28
@ -16830,7 +16830,7 @@ ov13_02234AA4: ; 0x02234AA4
add r2, r2, #6
strh r2, [r0, #4]
ldrh r0, [r0, #4]
bl sub_020CCD3C
bl FX_ModS32
cmp r0, #6
blt _02234AE0
bl ov13_022344F0
@ -16875,12 +16875,12 @@ ov13_02234B48: ; 0x02234B48
ldmeqia sp!, {r4, pc}
ldrh r0, [r0, #4]
mov r1, #0x1d
bl sub_020CCD00
bl FX_DivS32
ldr r1, _02234BBC ; =0x0224F54C
mov r4, r0
ldrh r0, [r1, #4]
mov r1, #0x1d
bl sub_020CCD3C
bl FX_ModS32
ldr r2, _02234BC0 ; =0x022455E8
ldr r1, _02234BC4 ; =0x01FF0000
sub ip, r0, #0x33
@ -16981,7 +16981,7 @@ _02234CC8:
mov r4, r0
ldrh r0, [r1, #4]
mov r1, #0x1d
bl sub_020CCD00
bl FX_DivS32
ldr r1, _02234D4C ; =0x0224F54C
ldrb r2, [r1, #2]
add r2, r2, r0
@ -23011,7 +23011,7 @@ ov13_02239808: ; 0x02239808
mov r0, #0x7f
bge _02239840
rsb r1, r4, #6
bl sub_020CCD00
bl FX_DivS32
_02239840:
bl ov13_0223ABDC
cmp r4, #2
@ -23022,7 +23022,7 @@ _02239840:
bge _0223986C
rsb r1, r4, #6
mov r0, #0x200
bl sub_020CCD00
bl FX_DivS32
sub r1, r0, #0x100
_0223986C:
ldr r0, _0223987C ; =0x0000FFFF
@ -31170,7 +31170,7 @@ ov13_02240288: ; 0x02240288
mov r6, r0
ldrh r1, [r5]
add r0, r2, #1
bl sub_020CCD3C
bl FX_ModS32
ldrb r1, [r5, #2]
mov r7, r0
cmp r7, r1
@ -31201,7 +31201,7 @@ ov13_022402E0: ; 0x022402E0
ldrh r1, [r6]
add r0, r2, r1
sub r0, r0, #1
bl sub_020CCD3C
bl FX_ModS32
and r1, r0, #0xff
strb r0, [r6, #3]
add r0, r6, r1, lsl #2
@ -31350,7 +31350,7 @@ ov13_02240490: ; 0x02240490
strb ip, [sp, #1]
strb r3, [sp, #2]
strb r2, [sp, #3]
bl sub_020CCD00
bl FX_DivS32
ldrb r3, [r4, #8]
add r2, sp, #4
mov r1, r0
@ -32629,7 +32629,7 @@ _02241588:
mov r1, r8
add r4, r4, #1
add r0, r0, #4
bl sub_020CCD3C
bl FX_ModS32
cmp r4, #4
blt _02241544
_022415A0:

2
asm/overlay_17.s
View File

@ -3641,7 +3641,7 @@ _02203828:
add r1, r6, #0
mov r2, #0x3c
mov r3, #0
bl _ll_div
bl _ll_sdiv
add r2, r0, #0
beq _02203876
ldr r0, [r4, #0x14]

6
asm/overlay_18.s
View File

@ -30288,7 +30288,7 @@ ov18_021F4E28: ; 0x021F4E28
ldrsh r1, [r2, r1]
lsl r0, r0, #0x14
lsl r1, r1, #0xc
bl sub_020CCBA0
bl FX_Div
bl _itof
ldr r1, _021F4EA8 ; =0x45800000
bl _fdiv
@ -33916,8 +33916,8 @@ ov18_021F6AB0: ; 0x021F6AB0
add r4, r1, #0
lsl r0, r0, #0x14
lsl r1, r2, #0xc
bl sub_020CCBA0
bl sub_020CCBB0
bl FX_Div
bl FX_Inv
mov r2, #0
str r0, [sp, #0xc]
str r0, [sp, #0x18]

8
asm/overlay_28.s
View File

@ -1168,24 +1168,24 @@ ov28_0225DE04: ; 0x0225DE04
ov28_0225DE64: ; 0x0225DE64
add r2, r0, #0
sub r1, #0x64
ldr r3, _0225DE74 ; =sub_020CD5DC
ldr r3, _0225DE74 ; =FX_Atan2Idx
sub r2, #0x54
lsl r0, r1, #0xc
lsl r1, r2, #0xc
bx r3
nop
_0225DE74: .word sub_020CD5DC
_0225DE74: .word FX_Atan2Idx
thumb_func_end ov28_0225DE64
thumb_func_start ov28_0225DE78
ov28_0225DE78: ; 0x0225DE78
ldr r3, _0225DE84 ; =sub_020CD5DC
ldr r3, _0225DE84 ; =FX_Atan2Idx
add r2, r0, #0
lsl r0, r1, #0xc
lsl r1, r2, #0xc
bx r3
nop
_0225DE84: .word sub_020CD5DC
_0225DE84: .word FX_Atan2Idx
thumb_func_end ov28_0225DE78
thumb_func_start ov28_0225DE88

2
asm/overlay_41.s
View File

@ -11473,7 +11473,7 @@ ov41_0224B32C: ; 0x0224B32C
orr r0, r1
ldr r1, [r4, #0x10]
lsl r1, r1, #0xc
bl sub_020CCBA0
bl FX_Div
ldr r1, [r4, #4]
add r0, r0, r1
str r0, [r4]

4
asm/overlay_45_thumb.s
View File

@ -15878,10 +15878,10 @@ _02230E8E:
sub r0, r2, r1
str r0, [sp, #0x40]
add r0, sp, #0
bl sub_020CAFEC
bl MTX_Identity33_
ldr r1, _02230F8C ; =0x021DA558
add r0, sp, #0
bl sub_020D4928
bl MI_Copy36B
ldr r1, _02230F90 ; =0x021DA51C
mov r0, #0xa4
ldr r2, [r1, #0x7c]

26
asm/overlay_48.s
View File

@ -497,7 +497,7 @@ ov48_02258BF4: ; 0x02258BF4
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r5, r0, #0
bl sub_020CB0EC
bl MTX_RotY33_
ldr r0, [r4]
ldr r3, _02258C68 ; =0x021094DC
lsl r0, r0, #0x10
@ -510,11 +510,11 @@ ov48_02258BF4: ; 0x02258BF4
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB0D0
bl MTX_RotX33_
add r0, r5, #0
add r1, sp, #0
add r2, r5, #0
bl sub_020CB410
bl MTX_Concat33
ldr r0, [r4, #8]
ldr r3, _02258C68 ; =0x021094DC
lsl r0, r0, #0x10
@ -527,11 +527,11 @@ ov48_02258BF4: ; 0x02258BF4
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB108
bl MTX_RotZ33_
add r0, r5, #0
add r1, sp, #0
add r2, r5, #0
bl sub_020CB410
bl MTX_Concat33
add sp, #0x24
pop {r4, r5, pc}
nop
@ -555,7 +555,7 @@ ov48_02258C6C: ; 0x02258C6C
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r5, r0, #0
bl sub_020CB0EC
bl MTX_RotY33_
ldr r0, [r4, #4]
ldr r3, _02258CE0 ; =0x021094DC
neg r0, r0
@ -569,11 +569,11 @@ ov48_02258C6C: ; 0x02258C6C
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB0D0
bl MTX_RotX33_
add r0, r5, #0
add r1, sp, #0
add r2, r5, #0
bl sub_020CB410
bl MTX_Concat33
ldr r0, [r4, #8]
ldr r3, _02258CE0 ; =0x021094DC
lsl r0, r0, #0x10
@ -586,11 +586,11 @@ ov48_02258C6C: ; 0x02258C6C
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB108
bl MTX_RotZ33_
add r0, r5, #0
add r1, sp, #0
add r2, r5, #0
bl sub_020CB410
bl MTX_Concat33
add sp, #0x24
pop {r4, r5, pc}
.balign 4, 0
@ -1431,7 +1431,7 @@ _02259312:
mul r0, r5
add r0, r1, r0
lsl r0, r0, #0xc
bl sub_020CCBEC
bl FX_Sqrt
asr r0, r0, #0xc
pop {r3, r4, r5, pc}
nop
@ -2320,7 +2320,7 @@ _022599F6:
cmp r6, #3
blt _022599C0
add r0, sp, #0x34
bl sub_020CAFEC
bl MTX_Identity33_
mov r0, #0xc1
lsl r0, r0, #8
add r0, r5, r0
@ -2340,7 +2340,7 @@ _02259A24:
add r0, r6, #0
add r1, sp, #0x10
add r2, sp, #0x34
bl sub_020CB410
bl MTX_Concat33
ldrh r2, [r4, #0x2c]
cmp r2, #3
beq _02259A44

48
asm/overlay_49.s
View File

@ -112,7 +112,7 @@ ov49_022588A0: ; 0x022588A0
bl sub_020182EC
add r5, r0, #0
add r0, sp, #0x24
bl sub_020CAFEC
bl MTX_Identity33_
asr r0, r6, #4
lsl r3, r0, #1
lsl r1, r3, #1
@ -122,11 +122,11 @@ ov49_022588A0: ; 0x022588A0
ldrsh r1, [r2, r1]
ldrsh r2, [r2, r3]
add r0, sp, #0
bl sub_020CB0D0
bl MTX_RotX33_
add r1, sp, #0x24
add r0, sp, #0
add r2, r1, #0
bl sub_020CB410
bl MTX_Concat33
asr r0, r5, #4
lsl r2, r0, #1
lsl r1, r2, #1
@ -136,11 +136,11 @@ ov49_022588A0: ; 0x022588A0
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB108
bl MTX_RotZ33_
add r1, sp, #0x24
add r0, sp, #0
add r2, r1, #0
bl sub_020CB410
bl MTX_Concat33
asr r0, r7, #4
lsl r2, r0, #1
lsl r1, r2, #1
@ -150,11 +150,11 @@ ov49_022588A0: ; 0x022588A0
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB0EC
bl MTX_RotY33_
add r1, sp, #0x24
add r0, sp, #0
add r2, r1, #0
bl sub_020CB410
bl MTX_Concat33
ldr r0, [r4, #8]
add r1, sp, #0x54
add r2, sp, #0x24
@ -1640,7 +1640,7 @@ _0225939C:
bl _ftoi
add r1, r0, #0
add r0, r6, #0
bl sub_020CCBA0
bl FX_Div
ldr r1, [r5, #4]
add r0, r0, r1
str r0, [r5]
@ -4542,7 +4542,7 @@ ov49_0225A854: ; 0x0225A854
strh r1, [r0, #4]
add r0, sp, #4
add r1, r0, #0
bl sub_020CD0F8
bl VEC_Fx16Normalize
add r4, sp, #4
mov r1, #0
mov r2, #2
@ -4561,7 +4561,7 @@ ov49_0225A854: ; 0x0225A854
strh r1, [r0, #4]
add r0, sp, #4
add r1, r0, #0
bl sub_020CD0F8
bl VEC_Fx16Normalize
mov r0, #2
mov r1, #0
mov r3, #4
@ -4581,7 +4581,7 @@ ov49_0225A854: ; 0x0225A854
strh r1, [r0, #4]
add r0, sp, #4
add r1, r0, #0
bl sub_020CD0F8
bl VEC_Fx16Normalize
mov r1, #0
mov r2, #2
mov r3, #4
@ -13653,7 +13653,7 @@ ov49_0225EC30: ; 0x0225EC30
orr r0, r1
mov r1, #0xa
lsl r1, r1, #0xc
bl sub_020CCBA0
bl FX_Div
add r2, r0, #0
ldr r1, [r4, #8]
ldr r0, [r4]
@ -13688,7 +13688,7 @@ ov49_0225EC30: ; 0x0225EC30
orr r0, r1
mov r1, #0xa
lsl r1, r1, #0xc
bl sub_020CCBA0
bl FX_Div
mov r3, #1
add r5, r0, #0
lsl r3, r3, #0xc
@ -18403,7 +18403,7 @@ _022612BC:
orr r0, r1
mov r1, #6
lsl r1, r1, #0xe
bl sub_020CCBA0
bl FX_Div
str r0, [sp, #0x14]
mov r0, #8
ldrsh r2, [r5, r0]
@ -18444,7 +18444,7 @@ _02261318:
orr r0, r1
mov r1, #5
lsl r1, r1, #0xe
bl sub_020CCBA0
bl FX_Div
str r0, [sp, #0x18]
b _02261346
_02261342:
@ -18454,7 +18454,7 @@ _02261346:
add r0, sp, #0x10
add r1, sp, #0x28
add r2, r0, #0
bl sub_020CCD78
bl VEC_Add
ldr r1, [sp, #0x10]
ldr r2, [sp, #0x14]
ldr r3, [sp, #0x18]
@ -19317,7 +19317,7 @@ _02261A7C:
orr r0, r1
mov r1, #6
lsl r1, r1, #0xe
bl sub_020CCBA0
bl FX_Div
str r0, [sp, #0x20]
ldr r1, [r4, #0xc]
add r0, r0, r1
@ -26339,7 +26339,7 @@ _0226549A:
bl _ftoi
add r1, r0, #0
add r0, r6, #0
bl sub_020CCBA0
bl FX_Div
ldr r1, [r5, #0x14]
add r0, r1, r0
str r0, [r5, #4]
@ -26399,7 +26399,7 @@ _02265520:
bl _ftoi
add r1, r0, #0
add r0, r6, #0
bl sub_020CCBA0
bl FX_Div
ldr r1, [r5, #0x1c]
add r0, r1, r0
str r0, [r5, #8]
@ -26459,7 +26459,7 @@ _022655A6:
bl _ftoi
add r1, r0, #0
add r0, r4, #0
bl sub_020CCBA0
bl FX_Div
ldr r1, [r5, #0x24]
add r0, r1, r0
str r0, [r5, #0xc]
@ -30954,11 +30954,11 @@ _02267950:
ldr r1, [sp, #0x34]
add r0, sp, #0x50
add r2, sp, #0x44
bl sub_020CCD78
bl VEC_Add
add r0, sp, #0x44
add r1, r7, #0
add r2, sp, #0x38
bl sub_020CCD78
bl VEC_Add
mov r0, #0x78
mul r0, r5
ldr r1, [sp, #0x28]
@ -34160,7 +34160,7 @@ ov49_02269178: ; 0x02269178
mov r1, #2
ldr r0, [r0]
lsl r1, r1, #0xc
bl sub_020CCBA0
bl FX_Div
add r7, r0, #0
cmp r6, #0
ble _022691B4
@ -34212,7 +34212,7 @@ _022691E8:
bl _ftoi
add r1, r0, #0
add r0, r4, #0
bl sub_020CCBA0
bl FX_Div
asr r2, r0, #0x1f
lsl r3, r2, #0xd
lsr r1, r0, #0x13

8
asm/overlay_51.s
View File

@ -1820,7 +1820,7 @@ ov51_021E69EC: ; 0x021E69EC
add r4, r0, #0
ldr r0, _021E6A44 ; =0x000030FC
ldr r0, [r4, r0]
bl sub_020CCBB0
bl FX_Inv
str r0, [sp, #8]
mov r0, #0
str r0, [sp, #0xc]
@ -1828,7 +1828,7 @@ ov51_021E69EC: ; 0x021E69EC
mov r0, #0x31
lsl r0, r0, #8
ldr r0, [r4, r0]
bl sub_020CCBB0
bl FX_Inv
str r0, [sp, #0x14]
bl sub_020D3AB4
mov r0, #0
@ -2074,11 +2074,11 @@ ov51_021E6C00: ; 0x021E6C00
sub sp, #0x18
mov r0, #1
lsl r0, r0, #0xc
bl sub_020CCBB0
bl FX_Inv
add r4, r0, #0
mov r0, #1
lsl r0, r0, #0xc
bl sub_020CCBB0
bl FX_Inv
mov r1, #0
str r4, [sp, #8]
str r1, [sp, #0xc]

8
asm/overlay_59.s
View File

@ -2847,7 +2847,7 @@ _02239332:
bl _ftoi
add r1, r0, #0
add r0, r5, #0
bl sub_020CCBA0
bl FX_Div
str r0, [r4, #0xc]
ldrb r0, [r4, #5]
cmp r0, #0
@ -2890,7 +2890,7 @@ _02239396:
bl _ftoi
add r1, r0, #0
add r0, r5, #0
bl sub_020CCBA0
bl FX_Div
str r0, [r4, #0x10]
ldr r0, _022393D0 ; =ov59_02239C90
add r1, r4, #0
@ -8499,7 +8499,7 @@ _0223BEE4:
add r1, r0, #0
mov r0, #1
lsl r0, r0, #0xc
bl sub_020CCBA0
bl FX_Div
str r0, [r4, #8]
mov r0, #0xc
strh r0, [r4, #0xe]
@ -8540,7 +8540,7 @@ _0223BF3C:
add r1, r0, #0
mov r0, #1
lsl r0, r0, #0xc
bl sub_020CCBA0
bl FX_Div
neg r0, r0
str r0, [r4, #8]
mov r0, #0xe

4
asm/overlay_60.s
View File

@ -2028,7 +2028,7 @@ _021E6924:
str r1, [sp, #0x14]
add r0, sp, #0xc
add r1, sp, #0
bl sub_020CCFE0
bl VEC_Normalize
mov r0, #0x77
ldr r1, [sp]
lsl r0, r0, #2
@ -2092,7 +2092,7 @@ _021E69EA:
sub r2, #0x3c
add r1, r5, r2
add r2, sp, #0
bl sub_020CCDAC
bl VEC_Subtract
mov r0, #1
ldr r1, [sp]
lsl r0, r0, #0xc

44
asm/overlay_61.s
View File

@ -1093,7 +1093,7 @@ _021E625C:
cmp r0, #0
beq _021E629C
add r0, r7, #0
bl sub_020CAFEC
bl MTX_Identity33_
add r0, r4, #0
add r0, #0x74
ldrh r0, [r0]
@ -1106,11 +1106,11 @@ _021E625C:
mov r3, #2
ldrsh r2, [r2, r3]
add r0, sp, #0x44
bl sub_020CB0EC
bl MTX_RotY33_
add r0, sp, #0x44
add r1, r7, #0
add r2, r7, #0
bl sub_020CB410
bl MTX_Concat33
add r1, r4, #0
ldr r3, [sp]
add r0, r4, #0
@ -1139,7 +1139,7 @@ _021E629C:
lsl r0, r0, #2
ldrh r4, [r5, r0]
add r0, sp, #0x20
bl sub_020CAFEC
bl MTX_Identity33_
asr r0, r4, #4
lsl r2, r0, #1
lsl r1, r2, #1
@ -1149,10 +1149,10 @@ _021E629C:
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0x20
bl sub_020CB0EC
bl MTX_RotY33_
ldr r1, _021E6348 ; =0x021DA558
add r0, sp, #0x20
bl sub_020D4928
bl MI_Copy36B
ldr r1, _021E634C ; =0x021DA51C
mov r0, #0xa4
ldr r2, [r1, #0x7c]
@ -2011,11 +2011,11 @@ _021E696E:
mov r3, #2
ldrsh r2, [r2, r3]
add r0, sp, #0x10
bl sub_020CB0EC
bl MTX_RotY33_
ldr r0, [sp, #8]
add r1, sp, #0x10
add r2, sp, #0x40
bl sub_020CB630
bl MTX_MultVec33
mov r0, #0xc
mul r0, r4
add r6, r7, r0
@ -2107,16 +2107,16 @@ ov61_021E6A48: ; 0x021E6A48
add r4, r1, #0
add r5, r0, #0
add r0, r4, #0
bl sub_020CB6AC
bl MTX_Identity43_
ldr r0, [r5, #0x64]
add r1, r4, #0
str r0, [sp]
ldr r2, [r5, #0x5c]
ldr r3, [r5, #0x60]
add r0, r4, #0
bl sub_020CB708
bl MTX_TransApply43
add r0, sp, #0x64
bl sub_020CB6AC
bl MTX_Identity43_
add r0, r5, #0
add r0, #0x76
ldrh r0, [r0]
@ -2129,11 +2129,11 @@ ov61_021E6A48: ; 0x021E6A48
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #4
bl sub_020CB800
bl MTX_RotX43_
add r1, sp, #0x64
add r0, sp, #4
add r2, r1, #0
bl sub_020CBBC8
bl MTX_Concat43
add r0, r5, #0
add r0, #0x74
ldrh r0, [r0]
@ -2146,24 +2146,24 @@ ov61_021E6A48: ; 0x021E6A48
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #4
bl sub_020CB820
bl MTX_RotY43_
add r1, sp, #0x64
add r0, sp, #4
add r2, r1, #0
bl sub_020CBBC8
bl MTX_Concat43
ldr r1, [r5, #0x68]
ldr r2, [r5, #0x6c]
ldr r3, [r5, #0x70]
add r0, sp, #0x34
bl sub_020CB7B4
bl MTX_Scale43_
add r0, sp, #0x64
add r1, r4, #0
add r2, r4, #0
bl sub_020CBBC8
bl MTX_Concat43
add r0, sp, #0x34
add r1, r4, #0
add r2, r4, #0
bl sub_020CBBC8
bl MTX_Concat43
add sp, #0x94
pop {r4, r5, pc}
.balign 4, 0
@ -3175,7 +3175,7 @@ ov61_021E7268: ; 0x021E7268
str r0, [sp, #4]
add r0, r7, #0
mov r1, ip
bl sub_020CCDAC
bl VEC_Subtract
asr r0, r6, #4
lsl r3, r0, #1
lsl r1, r3, #1
@ -3185,15 +3185,15 @@ ov61_021E7268: ; 0x021E7268
ldrsh r1, [r2, r1]
ldrsh r2, [r2, r3]
add r0, sp, #0x18
bl sub_020CB0D0
bl MTX_RotX33_
add r0, r7, #0
add r1, sp, #0x18
add r2, r0, #0
bl sub_020CB630
bl MTX_MultVec33
add r0, r7, #0
add r1, sp, #0
add r2, r0, #0
bl sub_020CCD78
bl VEC_Add
add r2, r4, #0
add r1, r5, #3
mov r0, #0x78

2
asm/overlay_62.s
View File

@ -1633,7 +1633,7 @@ _021E658C:
add r0, #8
add r1, #0x14
add r2, r0, #0
bl sub_020CCD78
bl VEC_Add
ldr r0, [r5, #8]
ldr r2, [r5, #0x20]
lsl r0, r0, #4

26
asm/overlay_63.s
View File

@ -6951,7 +6951,7 @@ _0221F6C0:
add r0, r1, r0
strh r0, [r4, #0x32]
ldr r0, [sp, #0x18]
bl sub_020CC044
bl MTX_Identity44_
add r7, r7, #1
add r5, r5, #6
add r6, r6, #6
@ -6967,7 +6967,7 @@ _0221F74C:
ldr r0, [sp, #0xc]
ldr r1, [sp, #0x10]
ldr r2, [sp, #0x14]
bl sub_020CCDE0
bl VEC_Fx16Add
add r0, r5, #0
sub r5, r5, #1
cmp r0, #0
@ -7125,9 +7125,9 @@ _0221F86C:
ldrsh r0, [r4, r0]
strh r0, [r4, #0x1e]
ldr r0, [sp, #0x10]
bl sub_020CCDE0
bl VEC_Fx16Add
ldr r0, [sp, #0xc]
bl sub_020CC044
bl MTX_Identity44_
mov r0, #0x14
ldrsh r0, [r4, r0]
mov r2, #0x10
@ -7137,7 +7137,7 @@ _0221F86C:
ldrsh r3, [r4, r3]
ldr r1, [sp, #0xc]
add r0, r5, #0
bl sub_020CC0A4
bl MTX_TransApply44
ldr r0, _0221FA74 ; =0x00001508
ldr r2, _0221FA84 ; =0x00002D6B
add r0, r7, r0
@ -7159,7 +7159,7 @@ _0221F86C:
strh r1, [r0, #4]
add r0, sp, #0x20
add r1, r0, #0
bl sub_020CD0F8
bl VEC_Fx16Normalize
add r3, sp, #0x20
add r1, sp, #0x20
mov r0, #4
@ -7183,7 +7183,7 @@ _0221F86C:
strh r1, [r0, #4]
add r0, sp, #0x20
add r1, r0, #0
bl sub_020CD0F8
bl VEC_Fx16Normalize
add r1, r6, #0
mov r0, #4
ldrsh r0, [r1, r0]
@ -7207,11 +7207,11 @@ _0221F86C:
mov r3, #2
ldrsh r2, [r2, r3]
add r0, sp, #0x28
bl sub_020CC17C
bl MTX_RotX44_
ldr r2, [sp, #0xc]
add r0, sp, #0x28
add r1, r5, #0
bl sub_020CC1E8
bl MTX_Concat44
ldrh r0, [r4, #0x2a]
ldr r3, _0221FA90 ; =0x021094DC
asr r0, r0, #4
@ -7222,11 +7222,11 @@ _0221F86C:
mov r3, #2
ldrsh r2, [r2, r3]
add r0, sp, #0x28
bl sub_020CC1A0
bl MTX_RotY44_
ldr r2, [sp, #0xc]
add r0, sp, #0x28
add r1, r5, #0
bl sub_020CC1E8
bl MTX_Concat44
ldrh r0, [r4, #0x2c]
ldr r3, _0221FA90 ; =0x021094DC
asr r0, r0, #4
@ -7237,11 +7237,11 @@ _0221F86C:
mov r3, #2
ldrsh r2, [r2, r3]
add r0, sp, #0x28
bl sub_020CC1C4
bl MTX_RotZ44_
ldr r2, [sp, #0xc]
add r0, sp, #0x28
add r1, r5, #0
bl sub_020CC1E8
bl MTX_Concat44
ldr r2, [r4, #8]
ldr r0, _0221FA74 ; =0x00001508
lsl r2, r2, #0x10

24
asm/overlay_69.s
View File

@ -2866,7 +2866,7 @@ ov69_021E70A8: ; 0x021E70A8
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r5, r0, #0
bl sub_020CB0EC
bl MTX_RotY33_
ldr r0, [r4]
ldr r3, _021E711C ; =0x021094DC
lsl r0, r0, #0x10
@ -2879,11 +2879,11 @@ ov69_021E70A8: ; 0x021E70A8
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB0D0
bl MTX_RotX33_
add r0, r5, #0
add r1, sp, #0
add r2, r5, #0
bl sub_020CB410
bl MTX_Concat33
ldr r0, [r4, #8]
ldr r3, _021E711C ; =0x021094DC
lsl r0, r0, #0x10
@ -2896,11 +2896,11 @@ ov69_021E70A8: ; 0x021E70A8
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB108
bl MTX_RotZ33_
add r0, r5, #0
add r1, sp, #0
add r2, r5, #0
bl sub_020CB410
bl MTX_Concat33
add sp, #0x24
pop {r4, r5, pc}
nop
@ -2924,7 +2924,7 @@ ov69_021E7120: ; 0x021E7120
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r5, r0, #0
bl sub_020CB0EC
bl MTX_RotY33_
ldr r0, [r4, #4]
ldr r3, _021E7194 ; =0x021094DC
neg r0, r0
@ -2938,11 +2938,11 @@ ov69_021E7120: ; 0x021E7120
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB0D0
bl MTX_RotX33_
add r0, r5, #0
add r1, sp, #0
add r2, r5, #0
bl sub_020CB410
bl MTX_Concat33
ldr r0, [r4, #8]
ldr r3, _021E7194 ; =0x021094DC
lsl r0, r0, #0x10
@ -2955,11 +2955,11 @@ ov69_021E7120: ; 0x021E7120
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB108
bl MTX_RotZ33_
add r0, r5, #0
add r1, sp, #0
add r2, r5, #0
bl sub_020CB410
bl MTX_Concat33
add sp, #0x24
pop {r4, r5, pc}
.balign 4, 0
@ -3397,7 +3397,7 @@ _021E74B6:
add r0, r6, #0
add r1, sp, #0x4c
add r2, sp, #4
bl sub_020CB410
bl MTX_Concat33
ldrh r2, [r4, #0x38]
cmp r2, #0
beq _021E74DE
@ -3587,7 +3587,7 @@ _021E762A:
mul r0, r5
add r0, r1, r0
lsl r0, r0, #0xc
bl sub_020CCBEC
bl FX_Sqrt
asr r0, r0, #0xc
pop {r3, r4, r5, pc}
nop

32
asm/overlay_71.s
View File

@ -1574,7 +1574,7 @@ ov71_02247514: ; 0x02247514
sub sp, #0x50
add r4, r0, #0
add r0, sp, #0x2c
bl sub_020CAFEC
bl MTX_Identity33_
add r0, r4, #0
add r0, #0x80
ldrh r0, [r0]
@ -1587,11 +1587,11 @@ ov71_02247514: ; 0x02247514
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #8
bl sub_020CB0D0
bl MTX_RotX33_
add r1, sp, #0x2c
add r0, sp, #8
add r2, r1, #0
bl sub_020CB410
bl MTX_Concat33
add r0, r4, #0
add r0, #0x82
ldrh r0, [r0]
@ -1604,11 +1604,11 @@ ov71_02247514: ; 0x02247514
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #8
bl sub_020CB0EC
bl MTX_RotY33_
add r1, sp, #0x2c
add r0, sp, #8
add r2, r1, #0
bl sub_020CB410
bl MTX_Concat33
add r0, r4, #0
add r0, #0x84
ldrh r0, [r0]
@ -1621,11 +1621,11 @@ ov71_02247514: ; 0x02247514
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #8
bl sub_020CB108
bl MTX_RotZ33_
add r1, sp, #0x2c
add r0, sp, #8
add r2, r1, #0
bl sub_020CB410
bl MTX_Concat33
add r0, r4, #0
add r0, #0x88
ldr r0, [r0]
@ -1880,7 +1880,7 @@ ov71_02247738: ; 0x02247738
sub sp, #0x4c
add r4, r0, #0
add r0, sp, #0x28
bl sub_020CAFEC
bl MTX_Identity33_
add r0, r4, #0
add r0, #0x80
ldrh r0, [r0]
@ -1893,11 +1893,11 @@ ov71_02247738: ; 0x02247738
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #4
bl sub_020CB0D0
bl MTX_RotX33_
add r1, sp, #0x28
add r0, sp, #4
add r2, r1, #0
bl sub_020CB410
bl MTX_Concat33
add r0, r4, #0
add r0, #0x82
ldrh r0, [r0]
@ -1910,11 +1910,11 @@ ov71_02247738: ; 0x02247738
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #4
bl sub_020CB0EC
bl MTX_RotY33_
add r1, sp, #0x28
add r0, sp, #4
add r2, r1, #0
bl sub_020CB410
bl MTX_Concat33
add r0, r4, #0
add r0, #0x84
ldrh r0, [r0]
@ -1927,11 +1927,11 @@ ov71_02247738: ; 0x02247738
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #4
bl sub_020CB108
bl MTX_RotZ33_
add r1, sp, #0x28
add r0, sp, #4
add r2, r1, #0
bl sub_020CB410
bl MTX_Concat33
mov r1, #0
mov r0, #0x11
add r2, r1, #0
@ -6422,7 +6422,7 @@ _02249AEC:
add r0, #0x1c
add r1, #0x10
add r2, r5, #0
bl sub_020CCD78
bl VEC_Add
pop {r4, r5, r6, pc}
.balign 4, 0
thumb_func_end ov71_02249A98
@ -7968,7 +7968,7 @@ _0224A744:
add r0, #0x1c
add r1, #0x10
add r2, r5, #0
bl sub_020CCD78
bl VEC_Add
pop {r4, r5, r6, pc}
_0224A7BA:
add r2, r5, #0

4
asm/overlay_74_thumb.s
View File

@ -9220,7 +9220,7 @@ _0222B9B8:
bl _fsub
_0222B9C6:
bl _ftoi
bl sub_020CCBEC
bl FX_Sqrt
bl _itof
ldr r1, _0222BA44 ; =0x45800000
bl _fdiv
@ -9445,7 +9445,7 @@ _0222BBBE:
bl _ftoi
add r1, r0, #0
add r0, r6, #0
bl sub_020CD5DC
bl FX_Atan2Idx
str r0, [r5, #0x28]
ldr r0, [r5, #0x24]
add sp, #0x24

6
asm/overlay_80.s
View File

@ -28811,7 +28811,7 @@ _02237A58:
bl _fsub
_02237A66:
bl _ftoi
bl sub_020CCBEC
bl FX_Sqrt
pop {r3, pc}
thumb_func_end ov80_02237A40
@ -34575,7 +34575,7 @@ ov80_0223A75C: ; 0x0223A75C
add r1, r4, r1
asr r5, r1, #3
mov r1, #8
bl sub_020CCD3C
bl FX_ModS32
cmp r0, #0
beq _0223A784
add r5, r5, #1
@ -34783,7 +34783,7 @@ ov80_0223A8D4: ; 0x0223A8D4
orr r0, r1
ldr r1, [r4, #0x10]
lsl r1, r1, #0xc
bl sub_020CCBA0
bl FX_Div
ldr r1, [r4, #4]
add r0, r0, r1
str r0, [r4]

18
asm/overlay_89.s
View File

@ -2355,7 +2355,7 @@ ov89_02259C0C: ; 0x02259C0C
str r0, [sp, #0x2c]
str r0, [sp, #0x30]
add r0, sp, #4
bl sub_020CAFEC
bl MTX_Identity33_
bl sub_02026E48
add r0, r4, #0
add r0, #0xcc
@ -2387,7 +2387,7 @@ ov89_02259C0C: ; 0x02259C0C
bl sub_020BEFD4
ldr r1, _02259CC8 ; =0x021DA558
add r0, sp, #4
bl sub_020D4928
bl MI_Copy36B
ldr r1, _02259CCC ; =0x021DA51C
mov r0, #0xa4
ldr r2, [r1, #0x7c]
@ -3301,7 +3301,7 @@ ov89_0225A368: ; 0x0225A368
add r1, r4, r1
asr r5, r1, #3
mov r1, #8
bl sub_020CCD3C
bl FX_ModS32
cmp r0, #0
beq _0225A390
add r5, r5, #1
@ -4763,18 +4763,18 @@ _0225ADC0:
mov r2, #1
lsl r2, r2, #0xc
mov r3, #0
bl _ll_div
bl _ll_sdiv
add r2, r4, #0
add r3, r6, #0
bl _ll_mul
mov r2, #0x64
mov r3, #0
bl _ll_div
bl _ll_sdiv
sub r0, r0, r4
sbc r1, r6
mov r2, #2
mov r3, #0
bl _ll_div
bl _ll_sdiv
ldr r1, [r5, #4]
mov r2, #0x64
add r1, r1, r0
@ -4793,18 +4793,18 @@ _0225ADC0:
mov r2, #1
lsl r2, r2, #0xc
mov r3, #0
bl _ll_div
bl _ll_sdiv
add r2, r4, #0
add r3, r6, #0
bl _ll_mul
mov r2, #0x64
mov r3, #0
bl _ll_div
bl _ll_sdiv
sub r0, r0, r4
sbc r1, r6
mov r2, #2
mov r3, #0
bl _ll_div
bl _ll_sdiv
ldr r1, [r5, #8]
add r1, r1, r0
str r1, [r5, #8]

4
asm/overlay_90.s
View File

@ -758,7 +758,7 @@ ov90_02258CF0: ; 0x02258CF0
add r1, r4, #0
mul r1, r4
lsl r1, r1, #0xc
bl sub_020CCBA0
bl FX_Div
str r6, [r5]
ldr r1, [sp]
str r6, [r5, #4]
@ -812,7 +812,7 @@ _02258D60:
lsr r0, r0, #0xc
orr r0, r1
lsl r1, r2, #2
bl sub_020CCBA0
bl FX_Div
ldr r1, [r5, #4]
add r0, r6, r0
add r0, r1, r0

92
asm/overlay_91.s
View File

@ -1992,7 +1992,7 @@ ov91_0225D40C: ; 0x0225D40C
add r1, r4, #0
mul r1, r4
lsl r1, r1, #0xc
bl sub_020CCBA0
bl FX_Div
str r6, [r5]
ldr r1, [sp]
str r6, [r5, #4]
@ -2039,7 +2039,7 @@ ov91_0225D46C: ; 0x0225D46C
lsr r0, r0, #0xc
orr r0, r1
lsl r1, r2, #2
bl sub_020CCBA0
bl FX_Div
ldr r1, [r5, #4]
add r0, r4, r0
add r0, r1, r0
@ -2112,13 +2112,13 @@ ov91_0225D500: ; 0x0225D500
str r0, [sp, #8]
add r0, sp, #4
str r1, [sp, #0xc]
bl sub_020CCF80
bl VEC_Mag
ldr r1, _0225D5F8 ; =0x0001E200
cmp r0, r1
ble _0225D582
add r0, sp, #4
add r1, r0, #0
bl sub_020CCFE0
bl VEC_Normalize
ldr r0, [sp, #4]
ldr r2, _0225D5F8 ; =0x0001E200
asr r1, r0, #0x1f
@ -2151,7 +2151,7 @@ _0225D582:
lsl r0, r0, #0xc
str r0, [sp, #8]
add r0, sp, #4
bl sub_020CCF80
bl VEC_Mag
ldr r2, _0225D5FC ; =0x0000099A
asr r1, r0, #0x1f
mov r3, #0
@ -2168,7 +2168,7 @@ _0225D582:
add r0, sp, #4
str r1, [sp, #0x10]
add r1, r0, #0
bl sub_020CCFE0
bl VEC_Normalize
lsl r0, r4, #0x10
add r2, sp, #0x28
mov r1, #0x10
@ -2583,7 +2583,7 @@ ov91_0225D884: ; 0x0225D884
lsr r0, r0, #0xc
orr r0, r1
lsl r1, r2, #5
bl sub_020CCBA0
bl FX_Div
add r2, r0, #0
mov r0, #0xc
mul r0, r6
@ -3183,7 +3183,7 @@ ov91_0225DD24: ; 0x0225DD24
add r5, r1, #0
add r0, #0xc
strh r5, [r4, #4]
bl sub_020CAFEC
bl MTX_Identity33_
asr r0, r5, #4
lsl r2, r0, #1
lsl r1, r2, #1
@ -3194,7 +3194,7 @@ ov91_0225DD24: ; 0x0225DD24
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, r4, #0
bl sub_020CB0D0
bl MTX_RotX33_
pop {r3, r4, r5, pc}
.balign 4, 0
_0225DD4C: .word 0x021094DC
@ -3208,10 +3208,10 @@ ov91_0225DD50: ; 0x0225DD50
add r4, r1, #0
add r0, #0x54
strh r4, [r5, #2]
bl sub_020CAFEC
bl MTX_Identity33_
add r0, r5, #0
add r0, #0x30
bl sub_020CAFEC
bl MTX_Identity33_
asr r0, r4, #4
lsl r2, r0, #1
lsl r1, r2, #1
@ -3222,20 +3222,20 @@ ov91_0225DD50: ; 0x0225DD50
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, #0x30
bl sub_020CB0EC
bl MTX_RotY33_
add r0, r5, #0
add r1, r5, #0
add r2, r5, #0
add r0, #0xc
add r1, #0x30
add r2, #0x54
bl sub_020CB410
bl MTX_Concat33
add r1, r5, #0
add r2, r5, #0
ldr r0, _0225DE88 ; =0x02261C4C
add r1, #0x54
add r2, #0x78
bl sub_020CB630
bl MTX_MultVec33
mov r0, #0
add r1, r5, #0
add r2, r5, #0
@ -3247,7 +3247,7 @@ ov91_0225DD50: ; 0x0225DD50
str r0, [sp, #0x10]
add r0, sp, #8
add r2, #0x84
bl sub_020CB630
bl MTX_MultVec33
add r0, r5, #0
add r0, #0xb8
ldr r1, [r0]
@ -3271,12 +3271,12 @@ ov91_0225DD50: ; 0x0225DD50
add r1, r5, #0
add r1, #0x30
add r2, r0, #0
bl sub_020CB630
bl MTX_MultVec33
add r1, r5, #0
add r1, #0x84
add r0, sp, #8
add r2, r1, #0
bl sub_020CCD78
bl VEC_Add
add r0, r5, #0
add r2, r5, #0
add r0, #0x80
@ -3341,7 +3341,7 @@ ov91_0225DD50: ; 0x0225DD50
add r0, #0x9c
add r1, #0x30
add r2, r5, #0
bl sub_020CB630
bl MTX_MultVec33
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.balign 4, 0
@ -3380,9 +3380,9 @@ _0225DEA4:
add r0, #0x84
add r1, r6, #0
add r2, sp, #0x1c
bl sub_020CCDAC
bl VEC_Subtract
add r0, sp, #0x1c
bl sub_020CCF80
bl VEC_Mag
add r6, r0, #0
ldr r0, [sp, #0xc]
cmp r0, #0
@ -3431,7 +3431,7 @@ _0225DEFA:
orr r5, r0
add r0, sp, #0x1c
add r1, sp, #0x10
bl sub_020CCFE0
bl VEC_Normalize
asr r0, r5, #0x1f
str r0, [sp, #8]
ldr r0, [sp, #0x10]
@ -3541,9 +3541,9 @@ _0225DFC4:
str r1, [sp, #4]
add r0, sp, #0xc
add r1, sp, #0
bl sub_020CCDAC
bl VEC_Subtract
add r0, sp, #0x18
bl sub_020CCF80
bl VEC_Mag
add r6, r0, #0
add r0, r5, #0
add r0, #0xdc
@ -3909,7 +3909,7 @@ ov91_0225E294: ; 0x0225E294
str r0, [r4, #0xc]
mov r0, #0x10
ldrsh r0, [r5, r0]
bl sub_020CCBA0
bl FX_Div
str r0, [r4, #0x10]
mov r0, #0xa
ldrsh r0, [r5, r0]
@ -4321,7 +4321,7 @@ _0225E5BE:
mov r6, #1
add r1, sp, #0x14
add r2, r0, #0
bl sub_020CCDAC
bl VEC_Subtract
mov r0, #0
add r2, r6, #0
str r0, [sp]
@ -4798,7 +4798,7 @@ _0225E93E:
add r0, #0x2c
add r1, sp, #4
add r2, r0, #0
bl sub_020CCDAC
bl VEC_Subtract
add r0, r6, #0
mov r2, #1
str r0, [sp]
@ -4957,7 +4957,7 @@ ov91_0225EA54: ; 0x0225EA54
add r4, r0, #0
add r0, #0x2c
add r2, r0, #0
bl sub_020CCD78
bl VEC_Add
mov r0, #0
str r0, [sp, #4]
ldr r0, [r4, #0x2c]
@ -4965,7 +4965,7 @@ ov91_0225EA54: ; 0x0225EA54
ldr r0, [r4, #0x34]
str r0, [sp, #8]
add r0, sp, #0
bl sub_020CCF80
bl VEC_Mag
str r0, [r4, #0x40]
add sp, #0xc
pop {r3, r4, pc}
@ -5055,7 +5055,7 @@ _0225EAE4:
mov r0, #0
str r0, [sp, #0x10]
add r0, sp, #0xc
bl sub_020CCF80
bl VEC_Mag
mov r1, #2
lsl r1, r1, #0xe
cmp r0, r1
@ -5064,7 +5064,7 @@ _0225EAE4:
beq _0225EB70
add r0, sp, #0xc
add r1, r0, #0
bl sub_020CCFE0
bl VEC_Normalize
ldr r3, [sp, #0xc]
asr r1, r3, #0x1f
lsr r0, r3, #0x11
@ -5102,7 +5102,7 @@ _0225EB74:
ble _0225EBBC
add r0, sp, #0xc
add r1, r0, #0
bl sub_020CCFE0
bl VEC_Normalize
ldr r0, [sp, #0xc]
ldr r2, _0225EC6C ; =0x0001E200
asr r1, r0, #0x1f
@ -5137,7 +5137,7 @@ _0225EBBC:
lsl r0, r0, #0xc
str r0, [sp, #0x10]
add r0, sp, #0xc
bl sub_020CCF80
bl VEC_Mag
ldr r2, _0225EC70 ; =0x0000099A
asr r1, r0, #0x1f
mov r3, #0
@ -5154,7 +5154,7 @@ _0225EBBC:
add r0, sp, #0xc
str r1, [sp, #0x18]
add r1, r0, #0
bl sub_020CCFE0
bl VEC_Normalize
add r2, sp, #0
mov r0, #0
mov r1, #2
@ -5359,7 +5359,7 @@ _0225ED78:
mul r0, r2
add r0, r1, r0
lsl r0, r0, #0xc
bl sub_020CCBEC
bl FX_Sqrt
asr r1, r0, #0xc
ldr r0, _0225EDAC ; =0x0000011E
cmp r1, r0
@ -8255,7 +8255,7 @@ ov91_0226045C: ; 0x0226045C
add r7, r1, #0
add r5, r2, #0
add r4, r3, #0
bl sub_020CAFEC
bl MTX_Identity33_
ldr r0, _0226049C ; =0x02261D3C
lsl r2, r4, #3
lsl r1, r5, #1
@ -8270,11 +8270,11 @@ ov91_0226045C: ; 0x0226045C
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB0EC
bl MTX_RotY33_
add r0, r6, #0
add r1, sp, #0
add r2, r7, #0
bl sub_020CB630
bl MTX_MultVec33
add sp, #0x24
pop {r4, r5, r6, r7, pc}
.balign 4, 0
@ -8291,7 +8291,7 @@ ov91_022604A4: ; 0x022604A4
add r7, r1, #0
add r5, r2, #0
add r4, r3, #0
bl sub_020CAFEC
bl MTX_Identity33_
ldr r0, _022604EC ; =0x02261D3C
lsl r2, r4, #3
lsl r1, r5, #1
@ -8306,14 +8306,14 @@ ov91_022604A4: ; 0x022604A4
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB0EC
bl MTX_RotY33_
add r0, sp, #0
add r1, r0, #0
bl sub_020CB120
bl MTX_Inverse33
add r0, r6, #0
add r1, sp, #0
add r2, r7, #0
bl sub_020CB630
bl MTX_MultVec33
add sp, #0x24
pop {r4, r5, r6, r7, pc}
.balign 4, 0
@ -8913,7 +8913,7 @@ _0226097A:
orr r0, r1
mov r1, #0x4b
lsl r1, r1, #0xe
bl sub_020CCBA0
bl FX_Div
mov r7, #1
add r3, r0, #0
lsl r7, r7, #0xc
@ -8936,7 +8936,7 @@ _0226097A:
orr r0, r1
mov r1, #0x4b
lsl r1, r1, #0xe
bl sub_020CCBA0
bl FX_Div
asr r1, r0, #0xc
mov r0, #0x18
sub r0, r0, r1
@ -9160,7 +9160,7 @@ ov91_02260B5C: ; 0x02260B5C
ldr r1, [r0]
ldr r0, [r1, #0x10]
ldr r1, [r1, #8]
bl sub_020CD5DC
bl FX_Atan2Idx
asr r0, r0, #4
lsl r4, r0, #1
ldr r1, _02260C3C ; =0x0001E200
@ -9503,7 +9503,7 @@ _02260DF2:
mov r1, #0xa
lsl r0, r0, #0xc
lsl r1, r1, #0xc
bl sub_020CCBA0
bl FX_Div
str r0, [sp, #0x14]
str r0, [sp, #0x18]
ldr r0, [r5, #4]
@ -10154,7 +10154,7 @@ ov91_02261208: ; 0x02261208
orr r6, r1
add r1, r2, r6
add r1, r3, r1
bl sub_020CCBA0
bl FX_Div
add r6, r0, #0
ldr r0, [r5]
asr r7, r6, #0x1f

38
asm/overlay_92.s
View File

@ -770,7 +770,7 @@ ov92_0225CB2C: ; 0x0225CB2C
lsl r1, r1, #4
add r1, r5, r1
add r2, r5, r2
bl sub_020CBE9C
bl MTX_MultVec43
add sp, #0x24
pop {r4, r5, r6, r7, pc}
_0225CB82:
@ -853,7 +853,7 @@ _0225CBEA:
add r0, r7, #0
add r1, r5, r1
add r2, r5, r2
bl sub_020CBE9C
bl MTX_MultVec43
ldr r0, _0225CC68 ; =0x0000058A
bl sub_02006184
cmp r0, #0
@ -2542,7 +2542,7 @@ ov92_0225DA40: ; 0x0225DA40
add r1, r2, #0
str r0, [r3]
add r0, r2, #0
bl sub_020CCFE0
bl VEC_Normalize
ldr r1, [sp, #0x18]
ldr r2, [sp, #0x1c]
ldr r3, [sp, #0x20]
@ -6890,7 +6890,7 @@ _0225FCCE:
lsl r1, r1, #4
add r1, r5, r1
add r2, r5, r2
bl sub_020CBE9C
bl MTX_MultVec43
ldr r0, _0225FE78 ; =0x00002B84
mov r1, #1
add sp, #0x2c
@ -7015,7 +7015,7 @@ _0225FDCC:
lsl r1, r1, #4
add r1, r5, r1
add r2, r5, r2
bl sub_020CBE9C
bl MTX_MultVec43
ldr r0, _0225FE78 ; =0x00002B84
mov r2, #1
add r1, r0, #0
@ -7306,7 +7306,7 @@ _02260028:
lsl r1, r1, #4
add r1, r5, r1
add r2, r5, r2
bl sub_020CBE9C
bl MTX_MultVec43
_0226007A:
ldr r0, _02260268 ; =0x00002B22
add sp, #0x44
@ -7389,7 +7389,7 @@ _022600AE:
lsl r1, r1, #4
add r1, r5, r1
add r2, r5, r2
bl sub_020CBE9C
bl MTX_MultVec43
b _02260194
_02260124:
cmp r2, #1
@ -7444,7 +7444,7 @@ _02260124:
lsl r1, r1, #4
add r1, r5, r1
add r2, r5, r2
bl sub_020CBE9C
bl MTX_MultVec43
_02260194:
ldr r1, _02260278 ; =0x00002B90
ldr r0, [r5, r1]
@ -7857,7 +7857,7 @@ _02260514:
bl _fsub
_02260522:
bl _ftoi
bl sub_020CCBEC
bl FX_Sqrt
add r7, r0, #0
bl _itof
ldr r1, _02260620 ; =0x45800000
@ -7871,11 +7871,11 @@ _02260522:
bl _dneq
beq _0226060A
add r0, r7, #0
bl sub_020CD4B0
bl FX_SinFx64c
str r0, [sp, #0x1c]
str r1, [sp, #0xc]
add r0, r7, #0
bl sub_020CD548
bl FX_CosFx64c
str r0, [sp, #0x20]
add r7, r1, #0
ldr r0, [sp, #0x1c]
@ -8026,7 +8026,7 @@ _022606A0:
bl _fsub
_022606AE:
bl _ftoi
bl sub_020CCBEC
bl FX_Sqrt
add r6, r0, #0
bl _itof
ldr r1, _02260774 ; =0x45800000
@ -8040,11 +8040,11 @@ _022606AE:
bl _dneq
beq _0226076E
add r0, r6, #0
bl sub_020CD4B0
bl FX_SinFx64c
str r0, [sp, #8]
add r0, r6, #0
add r7, r1, #0
bl sub_020CD548
bl FX_CosFx64c
str r0, [sp, #0xc]
add r6, r1, #0
ldr r0, [sp, #8]
@ -8168,7 +8168,7 @@ ov92_02260798: ; 0x02260798
add r1, r4, #0
mul r1, r4
lsl r1, r1, #0xc
bl sub_020CCBA0
bl FX_Div
str r6, [r5]
ldr r1, [sp]
str r6, [r5, #4]
@ -8215,7 +8215,7 @@ ov92_022607F8: ; 0x022607F8
lsr r0, r0, #0xc
orr r0, r1
lsl r1, r2, #2
bl sub_020CCBA0
bl FX_Div
ldr r1, [r5, #4]
add r0, r4, r0
add r0, r1, r0
@ -8278,7 +8278,7 @@ _02260888:
orr r0, r1
ldr r1, [r5, #0x14]
lsl r1, r1, #0xc
bl sub_020CCBA0
bl FX_Div
ldr r1, [r5, #4]
add r0, r0, r1
str r0, [r5]
@ -13530,7 +13530,7 @@ _02263286:
bl _fsub
_0226329C:
bl _ftoi
bl sub_020CCBEC
bl FX_Sqrt
bl _itof
ldr r1, _022632B0 ; =0x45800000
bl _fdiv
@ -14130,7 +14130,7 @@ ov92_02263824: ; 0x02263824
bl ov92_022634F8
add r0, sp, #0
add r1, r4, #0
bl sub_020CC070
bl MTX_Copy44To43_
add sp, #0x40
pop {r4, pc}
thumb_func_end ov92_02263824

12
asm/overlay_93_arm.s
View File

@ -280,7 +280,7 @@ ov93_0225F268: ; 0x0225F268
mov r0, r0, lsl #0xc
mov r2, #0x80000
mov r3, #0
bl _ll_div
bl _ll_sdiv
mov r1, r5, asr #0x1f
mov r1, r1, lsl #0xc
mov r4, r0
@ -288,7 +288,7 @@ ov93_0225F268: ; 0x0225F268
mov r0, r5, lsl #0xc
mov r2, #0x80000
mov r3, #0
bl _ll_div
bl _ll_sdiv
mov r5, r0
ldr r0, _0225F36C ; =0x00007FFF
cmp r4, r0
@ -587,7 +587,7 @@ _0225F6C0:
ldr r0, [sp, #0xc]
mov r1, #0x40000
sub r0, r0, r5
bl sub_020CD5DC
bl FX_Atan2Idx
add r1, r0, #0x8000
mov r1, r1, lsl #0x10
mov fp, r1, lsr #0x10
@ -596,7 +596,7 @@ _0225F6E0:
ldr r0, [sp, #0xc]
mov r1, #0x40000
sub r0, r0, r5
bl sub_020CD5DC
bl FX_Atan2Idx
add r1, r0, #0x8000
mov r1, r1, lsl #0x10
mov fp, r1, lsr #0x10
@ -606,7 +606,7 @@ _0225F700:
mov r1, #0x40000
sub r0, r0, r5
rsb r1, r1, #0
bl sub_020CD5DC
bl FX_Atan2Idx
mov fp, r0
add r0, fp, #0x8000
mov r0, r0, lsl #0x10
@ -803,7 +803,7 @@ ov93_0225F9AC: ; 0x0225F9AC
mov r0, r3
mov r3, #0
mov r2, #0x3200000
bl _ll_div
bl _ll_sdiv
ldmia sp!, {r3, pc}
arm_func_end ov93_0225F9AC

4
asm/overlay_93_thumb_1.s
View File

@ -1332,7 +1332,7 @@ ov93_0225D07C: ; 0x0225D07C
str r0, [sp, #0x30]
add r0, sp, #4
add r4, r1, #0
bl sub_020CAFEC
bl MTX_Identity33_
ldr r1, _0225D1B0 ; =0x000015A8
add r0, r4, #0
add r1, r4, r1
@ -1389,7 +1389,7 @@ ov93_0225D07C: ; 0x0225D07C
bl sub_020BEFD4
ldr r1, _0225D1CC ; =0x021DA558
add r0, sp, #4
bl sub_020D4928
bl MI_Copy36B
ldr r1, _0225D1D0 ; =0x021DA51C
mov r0, #0xa4
ldr r2, [r1, #0x7c]

6
asm/overlay_93_thumb_2.s
View File

@ -180,10 +180,10 @@ _0225FD3C:
str r0, [r5, #0x28]
_0225FD44:
ldr r0, [sp, #0x10]
bl sub_020CCBB0
bl FX_Inv
add r5, r0, #0
ldr r0, [sp, #0xc]
bl sub_020CCBB0
bl FX_Inv
str r0, [sp, #8]
ldr r0, [sp, #4]
mov r1, #7
@ -4512,7 +4512,7 @@ ov93_02261EB8: ; 0x02261EB8
add r1, r7, r1
asr r6, r1, #3
mov r1, #8
bl sub_020CCD3C
bl FX_ModS32
cmp r0, #0
beq _02261EE6
add r6, r6, #1

506
asm/overlay_96.s
View File

File diff suppressed because it is too large Load Diff

8
asm/unk_0201010C.s
View File

@ -1164,13 +1164,13 @@ sub_020109BC: ; 0x020109BC
ldr r2, _020109D0 ; =0x021094DC
add r1, r1, #1
lsl r1, r1, #1
ldr r3, _020109D4 ; =sub_020CCBA0
ldr r3, _020109D4 ; =FX_Div
ldrsh r0, [r2, r0]
ldrsh r1, [r2, r1]
bx r3
.balign 4, 0
_020109D0: .word 0x021094DC
_020109D4: .word sub_020CCBA0
_020109D4: .word FX_Div
thumb_func_end sub_020109BC
thumb_func_start sub_020109D8
@ -1250,7 +1250,7 @@ sub_02010A54: ; 0x02010A54
add r0, r4, r0
asr r0, r0, #1
lsl r0, r0, #0xc
bl sub_020CCBA0
bl FX_Div
pop {r4, pc}
thumb_func_end sub_02010A54
@ -3472,7 +3472,7 @@ _02011A6A:
lsr r2, r2, #0xc
orr r2, r1
sub r0, r0, r2
bl sub_020CCBEC
bl FX_Sqrt
asr r2, r0, #0xc
ldr r0, [sp]
sub r0, r0, r2

18
asm/unk_02018000.s
View File

@ -312,7 +312,7 @@ sub_020181EC: ; 0x020181EC
cmp r0, #0
beq _02018280
add r0, sp, #0x24
bl sub_020CAFEC
bl MTX_Identity33_
add r0, r4, #0
add r0, #0x70
ldrh r0, [r0]
@ -325,11 +325,11 @@ sub_020181EC: ; 0x020181EC
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB0D0
bl MTX_RotX33_
add r1, sp, #0x24
add r0, sp, #0
add r2, r1, #0
bl sub_020CB410
bl MTX_Concat33
add r0, r4, #0
add r0, #0x74
ldrh r0, [r0]
@ -342,11 +342,11 @@ sub_020181EC: ; 0x020181EC
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB108
bl MTX_RotZ33_
add r1, sp, #0x24
add r0, sp, #0
add r2, r1, #0
bl sub_020CB410
bl MTX_Concat33
add r0, r4, #0
add r0, #0x72
ldrh r0, [r0]
@ -359,11 +359,11 @@ sub_020181EC: ; 0x020181EC
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB0EC
bl MTX_RotY33_
add r1, sp, #0x24
add r0, sp, #0
add r2, r1, #0
bl sub_020CB410
bl MTX_Concat33
add r1, r4, #0
add r0, r4, #0
add r4, #0x60
@ -2307,7 +2307,7 @@ sub_02019040: ; 0x02019040
add r0, sp, #0x1c
add r1, r6, #0
add r2, #0xc
bl sub_020CCDAC
bl VEC_Subtract
b _020190C6
_020190BE:
mov r0, #0
@ -2545,7 +2545,7 @@ sub_0201925C: ; 0x0201925C
add r0, r2, #0
add r2, sp, #0
add r4, r3, #0
bl sub_020CCDAC
bl VEC_Subtract
add r2, sp, #0x18
ldrb r2, [r2, #0x10]
ldr r0, [sp]

82
asm/unk_0201F4C4.s
View File

@ -97,7 +97,7 @@ sub_0201F554: ; 0x0201F554
bl sub_020BEFD4
ldr r1, _0201F588 ; =0x021DA558
add r0, r4, #0
bl sub_020D4928
bl MI_Copy36B
ldr r1, _0201F58C ; =0x021DA51C
mov r0, #0xa4
ldr r2, [r1, #0x7c]
@ -750,7 +750,7 @@ _0201F9B0:
bl sub_020BEFD4
ldr r1, _0201FA2C ; =0x021DA558
add r0, r5, #0
bl sub_020D4928
bl MI_Copy36B
ldr r1, _0201FA30 ; =0x021DA51C
mov r0, #0xa4
ldr r2, [r1, #0x7c]
@ -1440,12 +1440,12 @@ _0201FEFA:
ldrsh r1, [r2, r1]
ldrsh r2, [r2, r3]
add r0, r5, #0
bl sub_020CAF88
bl MTX_Rot22_
add r0, r5, #0
add r1, r5, #0
add r2, r4, #0
add r3, r6, #0
bl sub_020CAF94
bl MTX_ScaleApply22
pop {r4, r5, r6, pc}
nop
_0201FF20: .word 0x0000FFFF
@ -3317,11 +3317,11 @@ sub_02020B9C: ; 0x02020B9C
add r0, r2, #0
add r4, r1, #0
add r2, sp, #0x44
bl sub_020CCDAC
bl VEC_Subtract
add r0, r5, #0
add r1, r4, #0
add r2, sp, #0x38
bl sub_020CCDAC
bl VEC_Subtract
ldr r0, [sp, #0x48]
ldr r5, [sp, #0x4c]
str r0, [sp]
@ -3333,7 +3333,7 @@ sub_02020B9C: ; 0x02020B9C
asr r7, r0, #0x1f
add r0, sp, #0x44
add r1, sp, #0x38
bl sub_020CCE14
bl VEC_DotProduct
str r0, [sp, #8]
add r0, r5, #0
add r1, r4, #0
@ -3382,17 +3382,17 @@ sub_02020B9C: ; 0x02020B9C
add r1, r4, r3
ldr r0, [sp, #8]
add r1, r2, r1
bl sub_020CCBA0
bl FX_Div
add r1, sp, #0x44
add r2, sp, #0x14
add r3, sp, #0x20
bl sub_020CD224
bl VEC_MultAdd
add r0, sp, #0x20
add r1, sp, #0x38
add r2, sp, #0x2c
bl sub_020CCDAC
bl VEC_Subtract
add r0, sp, #0x2c
bl sub_020CCF80
bl VEC_Mag
add sp, #0x50
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
@ -3404,10 +3404,10 @@ sub_02020C64: ; 0x02020C64
sub sp, #0x30
add r4, r1, #0
add r1, sp, #0x24
bl sub_020CCFE0
bl VEC_Normalize
add r0, r4, #0
add r1, sp, #0x18
bl sub_020CCFE0
bl VEC_Normalize
ldr r0, [sp, #0x24]
ldr r4, [sp, #0x18]
str r0, [sp]
@ -3490,7 +3490,7 @@ _02020D16:
pop {r3, r4, r5, r6, r7, pc}
_02020D1E:
add r1, r5, #0
bl sub_020CD5DC
bl FX_Atan2Idx
add sp, #0x30
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
@ -3514,7 +3514,7 @@ sub_02020D2C: ; 0x02020D2C
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r5, r0, #0
bl sub_020CB0D0
bl MTX_RotX33_
ldr r0, [r4, #4]
ldr r3, _02020DA0 ; =0x021094DC
lsl r0, r0, #0x10
@ -3527,11 +3527,11 @@ sub_02020D2C: ; 0x02020D2C
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB0EC
bl MTX_RotY33_
add r0, r5, #0
add r1, sp, #0
add r2, r5, #0
bl sub_020CB410
bl MTX_Concat33
ldr r0, [r4, #8]
ldr r3, _02020DA0 ; =0x021094DC
lsl r0, r0, #0x10
@ -3544,11 +3544,11 @@ sub_02020D2C: ; 0x02020D2C
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0
bl sub_020CB108
bl MTX_RotZ33_
add r0, r5, #0
add r1, sp, #0
add r2, r5, #0
bl sub_020CB410
bl MTX_Concat33
add sp, #0x24
pop {r4, r5, pc}
nop
@ -3571,7 +3571,7 @@ sub_02020DA4: ; 0x02020DA4
add r1, r0, #0
ldr r0, [sp]
add r2, r7, #0
bl sub_020CB0D0
bl MTX_RotX33_
add r0, r4, #0
bl sub_0201FC30
add r5, r0, #0
@ -3580,11 +3580,11 @@ sub_02020DA4: ; 0x02020DA4
add r1, r0, #0
add r0, sp, #4
add r2, r5, #0
bl sub_020CB0EC
bl MTX_RotY33_
ldr r0, [sp]
add r1, sp, #4
add r2, r0, #0
bl sub_020CB410
bl MTX_Concat33
add r0, r6, #0
bl sub_0201FC30
add r4, r0, #0
@ -3593,11 +3593,11 @@ sub_02020DA4: ; 0x02020DA4
add r1, r0, #0
add r0, sp, #4
add r2, r4, #0
bl sub_020CB108
bl MTX_RotZ33_
ldr r0, [sp]
add r1, sp, #4
add r2, r0, #0
bl sub_020CB410
bl MTX_Concat33
add sp, #0x28
pop {r3, r4, r5, r6, r7, pc}
thumb_func_end sub_02020DA4
@ -3617,7 +3617,7 @@ sub_02020E10: ; 0x02020E10
ldrsh r1, [r1, r2]
add r5, r3, #0
ldr r4, [sp, #0x18]
bl sub_020CCBA0
bl FX_Div
add r2, r0, #0
asr r1, r6, #0x1f
add r0, r6, #0
@ -3740,7 +3740,7 @@ sub_02020EF4: ; 0x02020EF4
beq _02020F1A
lsl r0, r0, #0xc
lsl r1, r1, #0xc
bl sub_020CCBA0
bl FX_Div
str r0, [sp]
b _02020F20
_02020F1A:
@ -3825,7 +3825,7 @@ _02020FAC:
ldr r0, [sp, #0x28]
sub r1, r3, r1
sub r0, r2, r0
bl sub_020CCBA0
bl FX_Div
str r0, [sp, #0xc]
ldr r0, [sp, #0x1c]
ldr r2, [sp, #0xc]
@ -3847,7 +3847,7 @@ _02020FAC:
str r0, [sp, #0x14]
ldr r0, [sp, #0xc]
add r1, sp, #0x30
bl sub_020CD788
bl FX_Modf
mov r1, #2
lsl r1, r1, #0xa
cmp r0, r1
@ -3864,7 +3864,7 @@ _02020FF8:
ldr r0, [sp, #0x14]
add r0, r1, r0
add r1, sp, #0x2c
bl sub_020CD788
bl FX_Modf
mov r1, #2
lsl r1, r1, #0xa
cmp r0, r1
@ -8169,7 +8169,7 @@ sub_02022D74: ; 0x02022D74
add r5, #0x20
add r1, r5, #0
add r2, r0, #0
bl sub_020CCD78
bl VEC_Add
pop {r3, r4, r5, pc}
nop
_02022E50: .word 0x021094DC
@ -8281,7 +8281,7 @@ sub_02022E54: ; 0x02022E54
add r5, #0x14
add r1, r5, #0
add r2, r0, #0
bl sub_020CCD78
bl VEC_Add
pop {r3, r4, r5, pc}
.balign 4, 0
_02022F34: .word 0x021094DC
@ -8618,7 +8618,7 @@ sub_02023154: ; 0x02023154
beq _0202319E
add r1, #0x48
add r2, sp, #0xc
bl sub_020CCDAC
bl VEC_Subtract
ldr r0, _020231EC ; =0x021D2204
add r1, sp, #0xc
ldr r0, [r0]
@ -8670,7 +8670,7 @@ _0202319E:
str r0, [r5]
ldr r3, _020231FC ; =0x021DA4E8
add r0, r4, #0
bl sub_020CBF3C
bl MTX_LookAt
ldr r1, _02023200 ; =0x021DA51C
mov r0, #0xe8
ldr r2, [r1, #0x7c]
@ -8865,9 +8865,9 @@ sub_02023308: ; 0x02023308
str r0, [r2]
add r0, r6, #0
add r2, sp, #0x30
bl sub_020CCDAC
bl VEC_Subtract
add r0, sp, #0x30
bl sub_020CCF80
bl VEC_Mag
str r0, [r4, #0x38]
mov r6, #0
add r0, sp, #0x24
@ -8958,7 +8958,7 @@ sub_020233D8: ; 0x020233D8
ldr r1, [r5, #4]
ldr r2, [r5, #8]
ldr r3, [r5, #0xc]
bl sub_020CC84C
bl MTX_PerspectiveW
ldr r1, _0202348C ; =0x021DA51C
mov r0, #0x50
ldr r2, [r1, #0x7c]
@ -8975,7 +8975,7 @@ _02023414:
ldr r4, [r5, #0x38]
ldr r0, [r5]
ldr r1, [r5, #4]
bl sub_020CCBA0
bl FX_Div
asr r1, r0, #0x1f
asr r3, r4, #0x1f
add r2, r4, #0
@ -9012,7 +9012,7 @@ _02023414:
neg r2, r3
str r0, [sp, #0xc]
add r0, r4, #0
bl sub_020CC998
bl MTX_OrthoW
ldr r1, _0202348C ; =0x021DA51C
mov r0, #0x50
ldr r2, [r1, #0x7c]
@ -9109,12 +9109,12 @@ sub_02023514: ; 0x02023514
add r0, #0x14
add r1, r5, #0
add r2, r0, #0
bl sub_020CCD78
bl VEC_Add
add r4, #0x20
add r0, r4, #0
add r1, r5, #0
add r2, r4, #0
bl sub_020CCD78
bl VEC_Add
pop {r3, r4, r5, pc}
thumb_func_end sub_02023514
@ -9761,7 +9761,7 @@ sub_02023950: ; 0x02023950
bl GF_AssertFail
_0202395C:
add r0, sp, #0
bl sub_020CAFEC
bl MTX_Identity33_
add r0, r5, #0
add r0, #0xc8
ldr r4, [r0]

18
asm/unk_02025534.s
View File

@ -107011,7 +107011,7 @@ sub_02056A54: ; 0x02056A54
str r0, [r3]
add r0, r2, #0
add r2, sp, #0x1c
bl sub_020CCDAC
bl VEC_Subtract
ldr r0, [r4, #0x40]
bl sub_0205C654
add r5, r0, #0
@ -107081,7 +107081,7 @@ sub_02056AEC: ; 0x02056AEC
str r0, [r3]
add r0, r2, #0
add r2, sp, #0x1c
bl sub_020CCDAC
bl VEC_Subtract
ldr r0, [r5, #0x40]
bl sub_0205C654
add r4, r0, #0
@ -107178,7 +107178,7 @@ sub_02056BC8: ; 0x02056BC8
str r0, [r3]
add r0, r2, #0
add r2, sp, #0x18
bl sub_020CCDAC
bl VEC_Subtract
ldr r0, [r4, #0x40]
bl sub_0205C6DC
add r5, r0, #0
@ -107244,7 +107244,7 @@ sub_02056C64: ; 0x02056C64
str r0, [r3]
add r0, r2, #0
add r2, sp, #0x18
bl sub_020CCDAC
bl VEC_Subtract
ldr r0, [r4, #0x40]
bl sub_0205C6DC
add r5, r0, #0
@ -135411,7 +135411,7 @@ _02063336:
_02063344:
bl _ftoi
ldr r1, [sp, #8]
bl sub_020CCBA0
bl FX_Div
ldr r1, [r4, #8]
str r0, [r1, #4]
lsl r0, r7, #4
@ -135433,7 +135433,7 @@ _0206336A:
_02063378:
bl _ftoi
ldr r1, [sp, #8]
bl sub_020CCBA0
bl FX_Div
ldr r1, [r4, #8]
str r0, [r1, #8]
ldr r0, [sp, #4]
@ -135458,7 +135458,7 @@ _020633A2:
_020633B2:
bl _ftoi
ldr r1, [sp, #8]
bl sub_020CCBA0
bl FX_Div
ldr r1, [r4, #8]
str r0, [r1, #0xc]
mov r0, #0xb4
@ -210752,7 +210752,7 @@ _02087344:
bl _fsub
_02087352:
bl _ftoi
bl sub_020CCBEC
bl FX_Sqrt
bl _itof
ldr r1, _020873D0 ; =0x45800000
bl _fdiv
@ -211004,7 +211004,7 @@ _02087576:
bl _ftoi
add r1, r0, #0
ldr r0, [sp, #0x2c]
bl sub_020CD5DC
bl FX_Atan2Idx
str r0, [r5, #0x30]
b _020875AC
_0208758E:

118
global.inc
View File

@ -342,7 +342,7 @@
.public _ftoi
.public _ftou
.public _itof
.public _ll_div
.public _ll_sdiv
.public _ll_mod
.public _ll_mul
.public _ll_shl
@ -27042,63 +27042,63 @@
.public sub_020C9E1C
.public sub_020C9E48
.public sub_020CA8E4
.public sub_020CAF70
.public sub_020CAF88
.public sub_020CAF94
.public sub_020CAFEC
.public sub_020CB0D0
.public sub_020CB0EC
.public sub_020CB108
.public sub_020CB120
.public sub_020CB410
.public sub_020CB630
.public sub_020CB6AC
.public sub_020CB6D4
.public sub_020CB708
.public sub_020CB7B4
.public sub_020CB7CC
.public sub_020CB800
.public sub_020CB820
.public sub_020CB83C
.public sub_020CBBC8
.public sub_020CBE9C
.public sub_020CBF3C
.public sub_020CC044
.public sub_020CC070
.public sub_020CC0A4
.public sub_020CC17C
.public sub_020CC1A0
.public sub_020CC1C4
.public sub_020CC1E8
.public sub_020CC84C
.public sub_020CC998
.public sub_020CCBA0
.public sub_020CCBB0
.public sub_020CCBC0
.public sub_020CCBEC
.public sub_020CCC20
.public sub_020CCC44
.public sub_020CCC7C
.public sub_020CCCD8
.public sub_020CCD00
.public sub_020CCD3C
.public sub_020CCD78
.public sub_020CCDAC
.public sub_020CCDE0
.public sub_020CCE14
.public sub_020CCE50
.public sub_020CCE94
.public sub_020CCF18
.public sub_020CCF80
.public sub_020CCFE0
.public sub_020CD0F8
.public sub_020CD224
.public sub_020CD280
.public sub_020CD4B0
.public sub_020CD548
.public sub_020CD5DC
.public sub_020CD784
.public sub_020CD788
.public MTX_Identity22_
.public MTX_Rot22_
.public MTX_ScaleApply22
.public MTX_Identity33_
.public MTX_RotX33_
.public MTX_RotY33_
.public MTX_RotZ33_
.public MTX_Inverse33
.public MTX_Concat33
.public MTX_MultVec33
.public MTX_Identity43_
.public MTX_Copy43To44_
.public MTX_TransApply43
.public MTX_Scale43_
.public MTX_ScaleApply43
.public MTX_RotX43_
.public MTX_RotY43_
.public MTX_Inverse43
.public MTX_Concat43
.public MTX_MultVec43
.public MTX_LookAt
.public MTX_Identity44_
.public MTX_Copy44To43_
.public MTX_TransApply44
.public MTX_RotX44_
.public MTX_RotY44_
.public MTX_RotZ44_
.public MTX_Concat44
.public MTX_PerspectiveW
.public MTX_OrthoW
.public FX_Div
.public FX_Inv
.public FX_InvFx64c
.public FX_Sqrt
.public FX_GetDivResultFx64c
.public FX_GetDivResult
.public FX_InvAsync
.public FX_DivAsync
.public FX_DivS32
.public FX_ModS32
.public VEC_Add
.public VEC_Subtract
.public VEC_Fx16Add
.public VEC_DotProduct
.public VEC_Fx16DotProduct
.public VEC_CrossProduct
.public VEC_Fx16CrossProduct
.public VEC_Mag
.public VEC_Normalize
.public VEC_Fx16Normalize
.public VEC_MultAdd
.public VEC_Distance
.public FX_SinFx64c
.public FX_CosFx64c
.public FX_Atan2Idx
.public FX_Init
.public FX_Modf
.public sub_020CD7C4
.public sub_020CD910
.public sub_020CD944
@ -27313,7 +27313,7 @@
.public sub_020D4830
.public sub_020D4858
.public sub_020D48B4
.public sub_020D4928
.public MI_Copy36B
.public sub_020D4968
.public sub_020D4A50
.public sub_020D4BD0

8
include/assert.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef POKEHEARTGOLD_ASSERT_H
#define POKEHEARTGOLD_ASSERT_H
void GF_AssertFail(void);
#define GF_ASSERT(expr) ((expr) ? (void)0 : GF_AssertFail())
#endif //POKEHEARTGOLD_ASSERT_H

4
include/global.h
View File

@ -4,8 +4,6 @@
#include <nitro.h>
#include <nitro/code16.h>
void GF_AssertFail(void);
#define GF_ASSERT(expr) ((expr) ? (void)0 : GF_AssertFail())
#include "assert.h"
#endif //POKEHEARTGOLD_GLOBAL_H

6
lib/asm/msl.s
View File

@ -16515,8 +16515,8 @@ _ll_mod: ; 0x020F2740
b _020F2760
arm_func_end _ll_mod
arm_func_start _ll_div
_ll_div: ; 0x020F2750
arm_func_start _ll_sdiv
_ll_sdiv: ; 0x020F2750
stmdb sp!, {r4, r5, r6, r7, fp, ip, lr}
eor r4, r1, r3
mov r4, r4, asr #1
@ -16644,7 +16644,7 @@ _020F28EC:
blt _020F28D8
ldmia sp!, {r4, r5, r6, r7, fp, ip, lr}
bx lr
arm_func_end _ll_div
arm_func_end _ll_sdiv
arm_func_start _ll_udiv
_ll_udiv: ; 0x020F2900

491
lib/asm/nitro.s
View File

File diff suppressed because it is too large Load Diff

208
lib/asm/nnsys.s
View File

@ -7327,13 +7327,13 @@ sub_020BA8D0: ; 0x020BA8D0
str lr, [sp, #0x14]
bl sub_020BAB58
mov r0, r5
bl sub_020CCBB0
bl FX_Inv
mov r1, #0
str r0, [sp]
mov r0, r4
str r1, [sp, #4]
str r1, [sp, #8]
bl sub_020CCBB0
bl FX_Inv
mov ip, #0
ldr r1, _020BAA0C ; =0x021D94D8
str r0, [sp, #0xc]
@ -11878,7 +11878,7 @@ _020BE64C:
beq _020BE690
mov r0, r2, lsl #0xc
mov r1, r1, lsl #0xc
bl sub_020CCBA0
bl FX_Div
_020BE690:
str r0, [r7, #0x24]
ldrh r1, [r7, #0x22]
@ -11887,7 +11887,7 @@ _020BE690:
beq _020BE6B0
mov r0, r6, lsl #0xc
mov r1, r1, lsl #0xc
bl sub_020CCBA0
bl FX_Div
_020BE6B0:
str r0, [r7, #0x28]
ldrb r0, [sb, #2]
@ -12498,9 +12498,9 @@ sub_020BEE44: ; 0x020BEE44
str r0, [r1, #0xa4]
ldr r0, _020BEF70 ; =0x021DA4E8
str r2, [r1, #0xb8]
bl sub_020CB6AC
bl MTX_Identity43_
ldr r0, _020BEF74 ; =0x021DA4A4
bl sub_020CC044
bl MTX_Identity44_
ldr ip, _020BEF78 ; =0x40000200
ldr r3, _020BEF7C ; =0xC0080000
ldr r2, _020BEF80 ; =0x2D8B62D8
@ -12530,7 +12530,7 @@ sub_020BEE44: ; 0x020BEE44
str r2, [r1, #0xe4]
ldr r0, _020BEF94 ; =0x021DA558
str r2, [r1, #0xe8]
bl sub_020CAFEC
bl MTX_Identity33_
mov r1, #0
ldr r0, _020BEF5C ; =0x021DA49C
mov r2, #0x1000
@ -12706,7 +12706,7 @@ sub_020BF0F8: ; 0x020BF0F8
bne _020BF128
ldr r0, _020BF134 ; =0x021DA4E8
ldr r1, _020BF138 ; =0x021DA59C
bl sub_020CB83C
bl MTX_Inverse43
ldr r0, _020BF130 ; =0x021DA49C
ldr r1, [r0, #0xfc]
orr r1, r1, #8
@ -12728,7 +12728,7 @@ sub_020BF13C: ; 0x020BF13C
add r1, sp, #8
bl sub_020D4968
ldr r0, [sp]
bl sub_020CC044
bl MTX_Identity44_
mov fp, #0
_020BF15C:
mov r3, fp
@ -12778,7 +12778,7 @@ _020BF1FC:
add r0, sp, #8
add r0, r0, fp, lsl #4
ldr r0, [r0, fp, lsl #2]
bl sub_020CCBC0
bl FX_InvFx64c
ldr r2, [sp]
mov r3, #0
mov lr, #0x80000000
@ -12892,7 +12892,7 @@ sub_020BF388: ; 0x020BF388
ldr r0, _020BF3CC ; =0x021DA558
ldr r1, _020BF3D0 ; =0x021DA4E8
ldr r2, _020BF3D4 ; =0x021DA5CC
bl sub_020CBBC8
bl MTX_Concat43
ldr r3, _020BF3D8 ; =0x021DA49C
ldr r0, _020BF3D4 ; =0x021DA5CC
ldr r2, [r3, #0xf4]
@ -12900,10 +12900,10 @@ sub_020BF388: ; 0x020BF388
str r2, [sp]
ldr r2, [r3, #0xec]
ldr r3, [r3, #0xf0]
bl sub_020CB7CC
bl MTX_ScaleApply43
ldr r0, _020BF3D4 ; =0x021DA5CC
ldr r1, _020BF3DC ; =0x021DA5FC
bl sub_020CB83C
bl MTX_Inverse43
ldmia sp!, {r3, pc}
.align 2, 0
_020BF3CC: .word 0x021DA558
@ -12967,11 +12967,11 @@ sub_020BF450: ; 0x020BF450
mov r4, r0
add r1, sp, #0
mov r0, r5
bl sub_020CB6D4
bl MTX_Copy43To44_
ldr r2, _020BF4B4 ; =0x021DA69C
add r1, sp, #0
mov r0, r4
bl sub_020CC1E8
bl MTX_Concat44
ldr r0, _020BF4B0 ; =0x021DA49C
ldr r1, [r0, #0xfc]
orr r1, r1, #0x40
@ -13217,7 +13217,7 @@ _020BF7CC:
beq _020BF7E8
ldr r0, [sb, #4]
mov r1, r5
bl sub_020CCBA0
bl FX_Div
mov r7, r0
_020BF7E8:
ldr r3, [sp, #0x18]
@ -13317,7 +13317,7 @@ _020BF940:
add r0, sl, #0x28
add r1, sl, #0x34
add r2, sl, #0x40
bl sub_020CCE94
bl VEC_CrossProduct
ldr r0, [sl, #0x28]
cmp r0, #0
ldreq r0, [sl, #0x2c]
@ -13333,7 +13333,7 @@ _020BF940:
_020BF990:
add r0, sl, #0x28
mov r1, r0
bl sub_020CCFE0
bl VEC_Normalize
_020BF99C:
ldr r0, [sl, #0x40]
cmp r0, #0
@ -13350,12 +13350,12 @@ _020BF99C:
_020BF9CC:
add r0, sl, #0x40
mov r1, r0
bl sub_020CCFE0
bl VEC_Normalize
_020BF9D8:
add r0, sl, #0x40
add r1, sl, #0x28
add r2, sl, #0x34
bl sub_020CCE94
bl VEC_CrossProduct
mov r0, #1
add sp, sp, #0x70
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
@ -14709,22 +14709,22 @@ _020C0C5C:
beq _020C0C9C
bl sub_020BF3E0
add r1, sp, #0x48
bl sub_020CB6D4
bl MTX_Copy43To44_
add r0, sp, #0x88
add r1, sp, #0x48
mov r2, r0
bl sub_020CC1E8
bl MTX_Concat44
b _020C0CC0
_020C0C9C:
tst r0, #2
beq _020C0CC0
ldr r0, _020C0E38 ; =0x021DA4E8
add r1, sp, #8
bl sub_020CB6D4
bl MTX_Copy43To44_
add r0, sp, #0x88
add r1, sp, #8
mov r2, r0
bl sub_020CC1E8
bl MTX_Concat44
_020C0CC0:
ldr r3, [sp, #0xb8]
ldr r2, [sp, #0xbc]
@ -14733,13 +14733,13 @@ _020C0CC0:
str r3, [r5]
str r2, [r5, #4]
str r1, [r5, #8]
bl sub_020CCF80
bl VEC_Mag
str r0, [r6]
add r0, sp, #0x98
bl sub_020CCF80
bl VEC_Mag
str r0, [r6, #4]
add r0, sp, #0xa8
bl sub_020CCF80
bl VEC_Mag
ldr r1, _020C0E34 ; =0x021DA49C
str r0, [r6, #8]
ldr r0, [r1, #0xfc]
@ -14921,22 +14921,22 @@ _020C0F68:
beq _020C0FA8
bl sub_020BF3E0
add r1, sp, #0x48
bl sub_020CB6D4
bl MTX_Copy43To44_
add r0, sp, #0x88
add r1, sp, #0x48
mov r2, r0
bl sub_020CC1E8
bl MTX_Concat44
b _020C0FCC
_020C0FA8:
tst r0, #2
beq _020C0FCC
ldr r0, _020C11A0 ; =0x021DA4E8
add r1, sp, #8
bl sub_020CB6D4
bl MTX_Copy43To44_
add r0, sp, #0x88
add r1, sp, #8
mov r2, r0
bl sub_020CC1E8
bl MTX_Concat44
_020C0FCC:
ldr r3, [sp, #0xb8]
ldr r2, [sp, #0xbc]
@ -14945,13 +14945,13 @@ _020C0FCC:
str r3, [fp]
str r2, [fp, #4]
str r1, [fp, #8]
bl sub_020CCF80
bl VEC_Mag
str r0, [r6]
add r0, sp, #0x98
bl sub_020CCF80
bl VEC_Mag
str r0, [r6, #4]
add r0, sp, #0xa8
bl sub_020CCF80
bl VEC_Mag
ldr r1, [sp, #0x9c]
str r0, [r6, #8]
cmp r1, #0
@ -14960,7 +14960,7 @@ _020C0FCC:
beq _020C1040
add r0, sp, #0x98
add r1, r7, #0xc
bl sub_020CCFE0
bl VEC_Normalize
ldr r1, [r7, #0x14]
ldr r0, [r7, #0x10]
rsb r1, r1, #0
@ -14970,7 +14970,7 @@ _020C0FCC:
_020C1040:
add r0, sp, #0xa8
add r1, r7, #0x18
bl sub_020CCFE0
bl VEC_Normalize
ldr r1, [r7, #0x1c]
ldr r0, [r7, #0x20]
rsb r1, r1, #0
@ -16518,7 +16518,7 @@ _020C2640:
bne _020C2640
add r0, sp, #0
mov r1, r6
bl sub_020CC070
bl MTX_Copy44To43_
_020C265C:
cmp r5, #0
beq _020C2674
@ -16742,7 +16742,7 @@ sub_020C28F8: ; 0x020C28F8
sub r1, r1, r2
mov r0, r0, lsl #0xc
mov r1, r1, lsl #0xc
bl sub_020CCBA0
bl FX_Div
rsb r1, r5, #0
mov r5, r0
ldr r0, [sp, #0x1c]
@ -16750,7 +16750,7 @@ sub_020C28F8: ; 0x020C28F8
add r0, r6, r0
sub r0, r0, #0xbf
mov r0, r0, lsl #0xc
bl sub_020CCBA0
bl FX_Div
cmp r5, #0
cmpge r0, #0
blt _020C2984
@ -16782,7 +16782,7 @@ _020C2998:
add r0, r0, r2
str r0, [sp, #0xc]
sub r0, r0, r1
bl sub_020CCC7C
bl FX_InvAsync
ldr r0, [r5, #0x10]
ldr r2, [r5]
smull r3, r0, sl, r0
@ -16828,13 +16828,13 @@ _020C2A78:
sub r6, r6, r2
sub r7, r7, r1
sub r8, r8, r0
bl sub_020CCC20
bl FX_GetDivResultFx64c
mov r5, r0
mov sl, r1
cmp r4, #0
beq _020C2AAC
ldr r0, [sp, #8]
bl sub_020CCC7C
bl FX_InvAsync
_020C2AAC:
mov r0, r6, asr #0x1f
umull r2, r1, r5, r6
@ -16859,7 +16859,7 @@ _020C2AAC:
str r0, [fp, #8]
cmp r4, #0
beq _020C2B70
bl sub_020CCC20
bl FX_GetDivResultFx64c
ldr r2, [sp, #4]
umull r6, r5, r0, r2
mov r2, r2, asr #0x1f
@ -19391,10 +19391,10 @@ _020C4AB0:
mov r0, r5
mov r1, r5
str r2, [r5, #0x14]
bl sub_020CCFE0
bl VEC_Normalize
add r0, r5, #0xc
mov r1, r0
bl sub_020CCFE0
bl VEC_Normalize
cmp sl, #0
bne _020C4C04
ldr r0, [r5, #0x18]
@ -19414,7 +19414,7 @@ _020C4AB0:
add r0, r5, #0x18
mov r1, r0
str r2, [r5, #0x20]
bl sub_020CCFE0
bl VEC_Normalize
add sp, sp, #0x48
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
_020C4C04:
@ -19488,10 +19488,10 @@ _020C4C70:
ldr r2, [sp, #0x14]
add r2, r3, r2
str r2, [r5, #0x14]
bl sub_020CCFE0
bl VEC_Normalize
add r0, r5, #0xc
mov r1, r0
bl sub_020CCFE0
bl VEC_Normalize
cmp r8, #0
bne _020C4D6C
ldr r2, [r5, #0x18]
@ -19508,7 +19508,7 @@ _020C4C70:
ldr r2, [sp, #0x20]
add r2, r3, r2
str r2, [r5, #0x20]
bl sub_020CCFE0
bl VEC_Normalize
add sp, sp, #0x48
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
_020C4D6C:
@ -19570,7 +19570,7 @@ _020C4DC8:
_020C4E44:
add r0, r5, #0x18
mov r1, r0
bl sub_020CCFE0
bl VEC_Normalize
add sp, sp, #0x48
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
.align 2, 0
@ -19639,7 +19639,7 @@ _020C4EB0:
_020C4F3C:
add r0, sl, #0x18
mov r1, r0
bl sub_020CCFE0
bl VEC_Normalize
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
_020C4F50:
@ -19738,10 +19738,10 @@ _020C4FD0:
mov r0, sl
mov r1, sl
str r2, [sl, #0x14]
bl sub_020CCFE0
bl VEC_Normalize
add r0, sl, #0xc
mov r1, r0
bl sub_020CCFE0
bl VEC_Normalize
cmp r5, #0
bne _020C5138
ldr r2, [sp, #0x3c]
@ -19767,7 +19767,7 @@ _020C4FD0:
add r0, sl, #0x18
mov r1, r0
str r2, [sl, #0x20]
bl sub_020CCFE0
bl VEC_Normalize
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
_020C5138:
@ -20610,7 +20610,7 @@ _020C5C40:
beq _020C5CCC
mov r0, r3, lsl #0xc
mov r1, r1, lsl #0xc
bl sub_020CCBA0
bl FX_Div
_020C5CCC:
str r0, [r4, #0x30]
ldrh r1, [r4, #0x2e]
@ -20619,7 +20619,7 @@ _020C5CCC:
beq _020C5CEC
mov r0, r5, lsl #0xc
mov r1, r1, lsl #0xc
bl sub_020CCBA0
bl FX_Div
_020C5CEC:
str r0, [r4, #0x34]
ldmia sp!, {r3, r4, r5, pc}
@ -20958,7 +20958,7 @@ sub_020C612C: ; 0x020C612C
mov fp, r1, lsl #0xc
mov r0, fp
mov r1, r8
bl sub_020CCCD8
bl FX_DivAsync
ldrsh r5, [sb, #0x22]
ldr r3, [sb, #0x18]
ldrsh r0, [sb, #0x20]
@ -20977,14 +20977,14 @@ sub_020C612C: ; 0x020C612C
orr r4, r4, r0, lsl #20
str r6, [sl]
str r4, [sl, #0x14]
bl sub_020CCC44
bl FX_GetDivResult
mov r1, fp
rsb r2, r5, #0
mul r0, r2, r0
mov r0, r0, asr #0xc
str r0, [sl, #4]
mov r0, r8
bl sub_020CCCD8
bl FX_DivAsync
sub r0, r5, r4
add r1, r7, r6
ldr r5, [sb, #0x18]
@ -21010,7 +21010,7 @@ sub_020C612C: ; 0x020C612C
mul r0, r3, r1
add r0, r0, r2, lsl #3
str r0, [sl, #0x34]
bl sub_020CCC44
bl FX_GetDivResult
mul r0, r7, r0
mov r0, r0, asr #0xc
str r0, [sl, #0x10]
@ -21028,12 +21028,12 @@ sub_020C6234: ; 0x020C6234
mov r7, r1, lsl #0xc
mov r0, r7
mov r1, r4
bl sub_020CCCD8
bl FX_DivAsync
ldrsh r0, [r5, #0x22]
str r0, [r6]
ldrsh r0, [r5, #0x22]
str r0, [r6, #0x14]
bl sub_020CCC44
bl FX_GetDivResult
ldrsh r2, [r5, #0x20]
mov r1, r7
rsb r2, r2, #0
@ -21041,7 +21041,7 @@ sub_020C6234: ; 0x020C6234
mov r2, r0, asr #0xc
mov r0, r4
str r2, [r6, #4]
bl sub_020CCCD8
bl FX_DivAsync
ldrsh r2, [r5, #0x20]
ldrsh r1, [r5, #0x22]
ldrh r3, [r5, #0x2c]
@ -21065,7 +21065,7 @@ sub_020C6234: ; 0x020C6234
mov r0, r1, lsl #4
add r0, r0, r2, lsl #3
str r0, [r6, #0x34]
bl sub_020CCC44
bl FX_GetDivResult
ldrsh r1, [r5, #0x20]
mul r0, r1, r0
mov r0, r0, asr #0xc
@ -21141,7 +21141,7 @@ sub_020C63C8: ; 0x020C63C8
mov fp, r1, lsl #0xc
mov r0, fp
mov r1, r8
bl sub_020CCCD8
bl FX_DivAsync
ldrsh r5, [sb, #0x22]
ldr r3, [sb, #0x18]
ldrsh r0, [sb, #0x20]
@ -21160,14 +21160,14 @@ sub_020C63C8: ; 0x020C63C8
orr r4, r4, r0, lsl #20
str r6, [sl]
str r4, [sl, #0x14]
bl sub_020CCC44
bl FX_GetDivResult
mov r1, fp
rsb r2, r5, #0
mul r0, r2, r0
mov r0, r0, asr #0xc
str r0, [sl, #4]
mov r0, r8
bl sub_020CCCD8
bl FX_DivAsync
sub r1, r5, r4
add r0, r7, r6
ldrh r3, [sb, #0x2c]
@ -21183,7 +21183,7 @@ sub_020C63C8: ; 0x020C63C8
mul r0, r2, r0
mov r0, r0, lsl #3
str r0, [sl, #0x34]
bl sub_020CCC44
bl FX_GetDivResult
mul r0, r7, r0
mov r0, r0, asr #0xc
str r0, [sl, #0x10]
@ -21201,12 +21201,12 @@ sub_020C64A8: ; 0x020C64A8
mov r7, r1, lsl #0xc
mov r0, r7
mov r1, r4
bl sub_020CCCD8
bl FX_DivAsync
ldrsh r0, [r5, #0x22]
str r0, [r6]
ldrsh r0, [r5, #0x22]
str r0, [r6, #0x14]
bl sub_020CCC44
bl FX_GetDivResult
ldrsh r2, [r5, #0x20]
mov r1, r7
rsb r2, r2, #0
@ -21214,7 +21214,7 @@ sub_020C64A8: ; 0x020C64A8
mov r2, r0, asr #0xc
mov r0, r4
str r2, [r6, #4]
bl sub_020CCCD8
bl FX_DivAsync
ldrsh r1, [r5, #0x20]
ldrsh r0, [r5, #0x22]
ldrh r2, [r5, #0x2c]
@ -21232,7 +21232,7 @@ sub_020C64A8: ; 0x020C64A8
mul r0, r2, r0
mov r0, r0, lsl #3
str r0, [r6, #0x34]
bl sub_020CCC44
bl FX_GetDivResult
ldrsh r1, [r5, #0x20]
mul r0, r1, r0
mov r0, r0, asr #0xc
@ -21728,7 +21728,7 @@ sub_020C6C24: ; 0x020C6C24
mov fp, r1, lsl #0xc
mov r0, fp
mov r1, r8
bl sub_020CCCD8
bl FX_DivAsync
ldrsh r0, [sb, #0x22]
ldr r3, [sb, #0x18]
ldrsh r5, [sb, #0x20]
@ -21747,13 +21747,13 @@ sub_020C6C24: ; 0x020C6C24
orr r4, r4, r0, lsl #20
str r7, [sl]
str r5, [sl, #0x14]
bl sub_020CCC44
bl FX_GetDivResult
mov r1, fp
mul r0, r4, r0
mov r0, r0, asr #0xc
str r0, [sl, #4]
mov r0, r8
bl sub_020CCCD8
bl FX_DivAsync
ldrh r1, [sb, #0x2c]
ldrh r8, [sb, #0x2e]
ldr r2, [sb, #0x28]
@ -21779,7 +21779,7 @@ sub_020C6C24: ; 0x020C6C24
orr r0, r0, r2, lsl #24
add r0, r0, r1, lsl #15
str r0, [sl, #0x34]
bl sub_020CCC44
bl FX_GetDivResult
rsb r1, r6, #0
mul r0, r1, r0
mov r0, r0, asr #0xc
@ -21798,19 +21798,19 @@ sub_020C6D2C: ; 0x020C6D2C
mov r7, r1, lsl #0xc
mov r0, r7
mov r1, r4
bl sub_020CCCD8
bl FX_DivAsync
ldrsh r0, [r5, #0x22]
str r0, [r6]
ldrsh r0, [r5, #0x22]
str r0, [r6, #0x14]
bl sub_020CCC44
bl FX_GetDivResult
ldrsh r2, [r5, #0x20]
mov r1, r7
mul r0, r2, r0
mov r2, r0, asr #0xc
mov r0, r4
str r2, [r6, #4]
bl sub_020CCCD8
bl FX_DivAsync
ldrh r2, [r5, #0x2c]
ldrh r4, [r5, #0x2e]
ldr r1, [r5, #0x28]
@ -21840,7 +21840,7 @@ sub_020C6D2C: ; 0x020C6D2C
orr r0, r0, r1, lsl #24
add r0, r0, ip, lsl #15
str r0, [r6, #0x34]
bl sub_020CCC44
bl FX_GetDivResult
ldrsh r1, [r5, #0x20]
rsb r1, r1, #0
mul r0, r1, r0
@ -21918,7 +21918,7 @@ sub_020C6EDC: ; 0x020C6EDC
mov fp, r1, lsl #0xc
mov r0, fp
mov r1, r8
bl sub_020CCCD8
bl FX_DivAsync
ldrsh r0, [sb, #0x22]
ldr r3, [sb, #0x18]
ldrsh r5, [sb, #0x20]
@ -21937,13 +21937,13 @@ sub_020C6EDC: ; 0x020C6EDC
orr r4, r4, r0, lsl #20
str r7, [sl]
str r5, [sl, #0x14]
bl sub_020CCC44
bl FX_GetDivResult
mov r1, fp
mul r0, r4, r0
mov r0, r0, asr #0xc
str r0, [sl, #4]
mov r0, r8
bl sub_020CCCD8
bl FX_DivAsync
ldrh r3, [sb, #0x2c]
ldrh r1, [sb, #0x2e]
rsb r0, r3, #0
@ -21965,7 +21965,7 @@ sub_020C6EDC: ; 0x020C6EDC
ldrh r0, [sb, #0x2e]
add r0, r4, r0, lsl #15
str r0, [sl, #0x34]
bl sub_020CCC44
bl FX_GetDivResult
rsb r1, r6, #0
mul r0, r1, r0
mov r0, r0, asr #0xc
@ -21984,19 +21984,19 @@ sub_020C6FD4: ; 0x020C6FD4
mov r7, r1, lsl #0xc
mov r0, r7
mov r1, r4
bl sub_020CCCD8
bl FX_DivAsync
ldrsh r0, [r5, #0x22]
str r0, [r6]
ldrsh r0, [r5, #0x22]
str r0, [r6, #0x14]
bl sub_020CCC44
bl FX_GetDivResult
ldrsh r2, [r5, #0x20]
mov r1, r7
mul r0, r2, r0
mov r2, r0, asr #0xc
mov r0, r4
str r2, [r6, #4]
bl sub_020CCCD8
bl FX_DivAsync
ldrh r2, [r5, #0x2c]
ldrh r1, [r5, #0x2e]
ldrsh r4, [r5, #0x22]
@ -22022,7 +22022,7 @@ sub_020C6FD4: ; 0x020C6FD4
orr r0, r0, r1, lsl #24
add r0, r0, ip, lsl #15
str r0, [r6, #0x34]
bl sub_020CCC44
bl FX_GetDivResult
ldrsh r1, [r5, #0x20]
rsb r1, r1, #0
mul r0, r1, r0
@ -22168,7 +22168,7 @@ sub_020C7268: ; 0x020C7268
mov fp, r1, lsl #0xc
mov r0, fp
mov r1, sl
bl sub_020CCCD8
bl FX_DivAsync
ldrsh r3, [r6, #0x22]
ldr r0, [r6, #0x18]
ldrsh sb, [r6, #0x20]
@ -22184,7 +22184,7 @@ sub_020C7268: ; 0x020C7268
mov r5, r2, lsr #0xc
orr r5, r5, r1, lsl #20
str r4, [r7, #0x14]
bl sub_020CCC44
bl FX_GetDivResult
smull r2, r1, r8, sb
mov r2, r2, lsr #0xc
orr r2, r2, r1, lsl #20
@ -22193,7 +22193,7 @@ sub_020C7268: ; 0x020C7268
str r0, [r7, #4]
mov r0, sl
mov r1, fp
bl sub_020CCCD8
bl FX_DivAsync
ldr lr, [r6, #0x1c]
ldrsh r2, [r6, #0x20]
ldr r8, [r6, #0x24]
@ -22238,7 +22238,7 @@ sub_020C7268: ; 0x020C7268
mul r1, r0, r2
mov r0, r1, lsl #4
str r0, [r7, #0x34]
bl sub_020CCC44
bl FX_GetDivResult
rsb r1, r5, #0
mul r0, r1, r0
mov r0, r0, asr #0xc
@ -22257,19 +22257,19 @@ sub_020C73BC: ; 0x020C73BC
mov r7, r1, lsl #0xc
mov r0, r7
mov r1, r4
bl sub_020CCCD8
bl FX_DivAsync
ldrsh r0, [r5, #0x22]
str r0, [r6]
ldrsh r0, [r5, #0x22]
str r0, [r6, #0x14]
bl sub_020CCC44
bl FX_GetDivResult
ldrsh r2, [r5, #0x20]
mov r1, r7
mul r0, r2, r0
mov r2, r0, asr #0xc
mov r0, r4
str r2, [r6, #4]
bl sub_020CCCD8
bl FX_DivAsync
ldrsh lr, [r5, #0x20]
ldr r4, [r5, #0x28]
ldrsh r0, [r5, #0x22]
@ -22297,7 +22297,7 @@ sub_020C73BC: ; 0x020C73BC
mul r0, r1, r0
mov r0, r0, lsl #4
str r0, [r6, #0x34]
bl sub_020CCC44
bl FX_GetDivResult
ldrsh r1, [r5, #0x20]
rsb r1, r1, #0
mul r0, r1, r0
@ -22379,7 +22379,7 @@ sub_020C7574: ; 0x020C7574
mov fp, r1, lsl #0xc
mov r0, fp
mov r1, r8
bl sub_020CCCD8
bl FX_DivAsync
ldrsh r3, [sb, #0x22]
ldr r0, [sb, #0x18]
ldrsh r7, [sb, #0x20]
@ -22395,7 +22395,7 @@ sub_020C7574: ; 0x020C7574
mov r6, r2, lsr #0xc
orr r6, r6, r1, lsl #20
str r4, [sl, #0x14]
bl sub_020CCC44
bl FX_GetDivResult
smull r2, r1, r5, r7
mov r2, r2, lsr #0xc
orr r2, r2, r1, lsl #20
@ -22404,7 +22404,7 @@ sub_020C7574: ; 0x020C7574
str r0, [sl, #4]
mov r0, r8
mov r1, fp
bl sub_020CCCD8
bl FX_DivAsync
sub r0, r4, #0x1000
ldrh r1, [sb, #0x2c]
mul r2, r1, r6
@ -22415,7 +22415,7 @@ sub_020C7574: ; 0x020C7574
mul r0, r1, r0
mov r0, r0, lsl #4
str r0, [sl, #0x34]
bl sub_020CCC44
bl FX_GetDivResult
rsb r1, r6, #0
mul r0, r1, r0
mov r0, r0, asr #0xc
@ -22434,19 +22434,19 @@ sub_020C7640: ; 0x020C7640
mov r7, r1, lsl #0xc
mov r0, r7
mov r1, r4
bl sub_020CCCD8
bl FX_DivAsync
ldrsh r0, [r5, #0x22]
str r0, [r6]
ldrsh r0, [r5, #0x22]
str r0, [r6, #0x14]
bl sub_020CCC44
bl FX_GetDivResult
ldrsh r2, [r5, #0x20]
mov r1, r7
mul r0, r2, r0
mov r2, r0, asr #0xc
mov r0, r4
str r2, [r6, #4]
bl sub_020CCCD8
bl FX_DivAsync
ldrh r1, [r5, #0x2c]
ldrsh r0, [r5, #0x20]
mul r0, r1, r0
@ -22459,7 +22459,7 @@ sub_020C7640: ; 0x020C7640
mul r0, r1, r0
mov r0, r0, lsl #4
str r0, [r6, #0x34]
bl sub_020CCC44
bl FX_GetDivResult
ldrsh r1, [r5, #0x20]
rsb r1, r1, #0
mul r0, r1, r0

136
lib/asm/sdk.s
View File

@ -1856,7 +1856,7 @@ sub_02099948: ; 0x02099948
add r2, sp, #0x30
blx r3
add r0, sp, #0xc0
bl sub_020CB6AC
bl MTX_Identity43_
ldr r0, [r5, #0x40]
ldr r0, [r0, #0x20]
ldr r0, [r0, #0x14]
@ -1866,12 +1866,12 @@ sub_02099948: ; 0x02099948
bne _02099A28
add r1, sp, #0x90
add r0, r4, #0x14
bl sub_020CCFE0
bl VEC_Normalize
b _02099A58
_02099A28:
add r1, sp, #0x90
add r0, r4, #8
bl sub_020CCFE0
bl VEC_Normalize
ldr r2, [sp, #0x90]
ldr r1, [sp, #0x94]
ldr r0, [sp, #0x98]
@ -1889,7 +1889,7 @@ _02099A58:
str r3, [sp, #0xb4]
str r2, [sp, #0xb8]
str r3, [sp, #0xbc]
bl sub_020CCE14
bl VEC_DotProduct
ldr r1, _02099DB0 ; =0x00000CCD
cmp r0, r1
bgt _02099A90
@ -1906,11 +1906,11 @@ _02099AA4:
add r0, sp, #0x90
add r1, sp, #0xb4
add r2, sp, #0x9c
bl sub_020CCE94
bl VEC_CrossProduct
add r0, sp, #0x90
add r1, sp, #0x9c
add r2, sp, #0xa8
bl sub_020CCE94
bl VEC_CrossProduct
ldr r7, [sp, #0x9c]
ldr r6, [sp, #0xa0]
ldr r3, [sp, #0xa4]
@ -1932,7 +1932,7 @@ _02099AA4:
str r7, [sp, #0xd8]
str r6, [sp, #0xdc]
str r3, [sp, #0xe0]
bl sub_020CBBC8
bl MTX_Concat43
ldr r0, [r5, #0x40]
ldr r2, [r4, #0x30]
ldr r0, [r0, #0x20]
@ -1992,11 +1992,11 @@ _02099BCC:
_02099BF0:
add r0, sp, #0x60
mov r3, r2
bl sub_020CB7B4
bl MTX_Scale43_
add r0, sp, #0x30
add r1, sp, #0x60
add r2, sp, #0
bl sub_020CBBC8
bl MTX_Concat43
ldr r0, [r5, #0x40]
ldr r0, [r0, #0x20]
ldr r3, [r0]
@ -2159,7 +2159,7 @@ sub_02099DC8: ; 0x02099DC8
add r2, sp, #0x30
blx r3
add r0, sp, #0xc0
bl sub_020CB6AC
bl MTX_Identity43_
ldr r0, [r5, #0x40]
ldr r0, [r0, #0x20]
ldr r0, [r0]
@ -2168,12 +2168,12 @@ sub_02099DC8: ; 0x02099DC8
bne _02099EA4
add r1, sp, #0x90
add r0, r4, #0x14
bl sub_020CCFE0
bl VEC_Normalize
b _02099ED4
_02099EA4:
add r1, sp, #0x90
add r0, r4, #8
bl sub_020CCFE0
bl VEC_Normalize
ldr r2, [sp, #0x90]
ldr r1, [sp, #0x94]
ldr r0, [sp, #0x98]
@ -2191,7 +2191,7 @@ _02099ED4:
str r3, [sp, #0xb4]
str r2, [sp, #0xb8]
str r3, [sp, #0xbc]
bl sub_020CCE14
bl VEC_DotProduct
ldr r1, _0209A22C ; =0x00000CCD
cmp r0, r1
bgt _02099F0C
@ -2208,11 +2208,11 @@ _02099F20:
add r0, sp, #0x90
add r1, sp, #0xb4
add r2, sp, #0x9c
bl sub_020CCE94
bl VEC_CrossProduct
add r0, sp, #0x90
add r1, sp, #0x9c
add r2, sp, #0xa8
bl sub_020CCE94
bl VEC_CrossProduct
ldr r7, [sp, #0x9c]
ldr r6, [sp, #0xa0]
ldr r3, [sp, #0xa4]
@ -2234,7 +2234,7 @@ _02099F20:
str r7, [sp, #0xd8]
str r6, [sp, #0xdc]
str r3, [sp, #0xe0]
bl sub_020CBBC8
bl MTX_Concat43
ldr r0, [r5, #0x40]
ldr r2, [r4, #0x30]
ldr r0, [r0, #0x20]
@ -2294,11 +2294,11 @@ _0209A048:
_0209A06C:
add r0, sp, #0x60
mov r3, r2
bl sub_020CB7B4
bl MTX_Scale43_
add r0, sp, #0x60
add r1, sp, #0x30
add r2, sp, #0
bl sub_020CBBC8
bl MTX_Concat43
ldr r0, [r5, #0x40]
ldr r0, [r0, #0x20]
ldr r3, [r0]
@ -2519,11 +2519,11 @@ _0209A3A0:
_0209A3C4:
add r0, sp, #0x60
mov r3, r2
bl sub_020CB7B4
bl MTX_Scale43_
add r0, sp, #0x30
add r1, sp, #0x60
add r2, sp, #0
bl sub_020CBBC8
bl MTX_Concat43
ldr r0, [r5, #0x40]
ldr r0, [r0, #0x20]
ldr r3, [r0]
@ -2742,11 +2742,11 @@ _0209A6F0:
_0209A714:
add r0, sp, #0x60
mov r3, r2
bl sub_020CB7B4
bl MTX_Scale43_
add r0, sp, #0x60
add r1, sp, #0x30
add r2, sp, #0
bl sub_020CBBC8
bl MTX_Concat43
ldr r0, [r5, #0x40]
ldr r0, [r0, #0x20]
ldr r3, [r0]
@ -2977,7 +2977,7 @@ _0209AA28:
ldr r3, [r8, #0x20]
mov r2, sb
str r3, [sp, #0x2c]
bl sub_020CCE94
bl VEC_CrossProduct
ldr r0, [sp, #0x18]
cmp r0, #0
bne _0209AACC
@ -2992,25 +2992,25 @@ _0209AA28:
_0209AACC:
add r0, sp, #0x18
mov r1, r0
bl sub_020CCFE0
bl VEC_Normalize
add r1, sp, #0x30
mov r0, r8
bl sub_020D4928
bl MI_Copy36B
add r0, sp, #0x18
add r1, sp, #0x30
mov r2, r0
bl sub_020CB630
bl MTX_MultVec33
add r0, sp, #0xc
mov r1, r8
mov r2, r0
bl sub_020CBE9C
bl MTX_MultVec43
add r0, r6, #0x14
add r3, sp, #0
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
mov r0, r3
mov r1, r3
bl sub_020CCFE0
bl VEC_Normalize
ldr r0, [r8, #0x20]
ldr r1, [sp, #8]
rsb r0, r0, #0
@ -3141,7 +3141,7 @@ _0209AC90:
ldr r3, [r8, #0x20]
mov r2, sb
str r3, [sp, #0x2c]
bl sub_020CCE94
bl VEC_CrossProduct
ldr r0, [sp, #0x18]
cmp r0, #0
bne _0209AD54
@ -3156,25 +3156,25 @@ _0209AC90:
_0209AD54:
add r0, sp, #0x18
mov r1, r0
bl sub_020CCFE0
bl VEC_Normalize
add r1, sp, #0x30
mov r0, r8
bl sub_020D4928
bl MI_Copy36B
add r0, sp, #0x18
add r1, sp, #0x30
mov r2, r0
bl sub_020CB630
bl MTX_MultVec33
add r0, sp, #0xc
mov r1, r8
mov r2, r0
bl sub_020CBE9C
bl MTX_MultVec43
add r0, r6, #0x14
add r3, sp, #0
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
mov r0, r3
mov r1, r3
bl sub_020CCFE0
bl VEC_Normalize
ldr r0, [r8, #0x20]
ldr r1, [sp, #8]
rsb r0, r0, #0
@ -3430,7 +3430,7 @@ _0209B108:
ldr r3, [r8, #0x20]
mov r2, sb
str r3, [sp, #0x2c]
bl sub_020CCE94
bl VEC_CrossProduct
ldr r0, [sp, #0x18]
cmp r0, #0
bne _0209B1AC
@ -3445,25 +3445,25 @@ _0209B108:
_0209B1AC:
add r0, sp, #0x18
mov r1, r0
bl sub_020CCFE0
bl VEC_Normalize
add r1, sp, #0x30
mov r0, r8
bl sub_020D4928
bl MI_Copy36B
add r0, sp, #0x18
add r1, sp, #0x30
mov r2, r0
bl sub_020CB630
bl MTX_MultVec33
add r0, sp, #0xc
mov r1, r8
mov r2, r0
bl sub_020CBE9C
bl MTX_MultVec43
add r0, r6, #0x14
add r3, sp, #0
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
mov r0, r3
mov r1, r3
bl sub_020CCFE0
bl VEC_Normalize
ldr r0, [r8, #0x20]
ldr r1, [sp, #8]
rsb r0, r0, #0
@ -3594,7 +3594,7 @@ _0209B370:
ldr r3, [r8, #0x20]
mov r2, sb
str r3, [sp, #0x2c]
bl sub_020CCE94
bl VEC_CrossProduct
ldr r0, [sp, #0x18]
cmp r0, #0
bne _0209B434
@ -3609,25 +3609,25 @@ _0209B370:
_0209B434:
add r0, sp, #0x18
mov r1, r0
bl sub_020CCFE0
bl VEC_Normalize
add r1, sp, #0x30
mov r0, r8
bl sub_020D4928
bl MI_Copy36B
add r0, sp, #0x18
add r1, sp, #0x30
mov r2, r0
bl sub_020CB630
bl MTX_MultVec33
add r0, sp, #0xc
mov r1, r8
mov r2, r0
bl sub_020CBE9C
bl MTX_MultVec43
add r0, r6, #0x14
add r3, sp, #0
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
mov r0, r3
mov r1, r3
bl sub_020CCFE0
bl VEC_Normalize
ldr r0, [r8, #0x20]
ldr r1, [sp, #8]
rsb r0, r0, #0
@ -3874,7 +3874,7 @@ _0209B7F0:
ldr r3, [r6, #0x40]
add r3, r8, r3
str r3, [sp, #8]
bl sub_020CBE9C
bl MTX_MultVec43
ldrh r0, [r6, #0x20]
ldr r2, _0209BAF0 ; =0x021094DC
mov sb, #0
@ -3955,7 +3955,7 @@ _0209B910:
mov r2, r0
sub r3, r8, r3
str r3, [sp, #8]
bl sub_020CBE9C
bl MTX_MultVec43
ldrh r0, [r6, #0x20]
ldr r2, _0209BAF0 ; =0x021094DC
mov lr, #0
@ -4160,7 +4160,7 @@ _0209BC34:
ldr r3, [r8, #0x40]
add r3, sl, r3
str r3, [sp, #8]
bl sub_020CBE9C
bl MTX_MultVec43
ldrh r0, [r8, #0x20]
ldr r2, _0209BF3C ; =0x021094DC
ldr ip, [sp]
@ -4241,7 +4241,7 @@ _0209BD60:
mov r2, r0
sub r3, sl, r3
str r3, [sp, #8]
bl sub_020CBE9C
bl MTX_MultVec43
ldrh r0, [r8, #0x20]
ldr r2, _0209BF3C ; =0x021094DC
mov r8, #0
@ -5023,7 +5023,7 @@ _0209C938:
add r0, sb, #0x84
add r1, sb, #0x8a
add r2, sp, #0x44
bl sub_020CCF18
bl VEC_Fx16CrossProduct
ldrsh r1, [sp, #0x46]
ldrsh r0, [sp, #0x48]
ldrsh r2, [sp, #0x44]
@ -5032,7 +5032,7 @@ _0209C938:
add r0, sp, #0x7c
add r1, r7, #8
str r2, [sp, #0x7c]
bl sub_020CCE14
bl VEC_DotProduct
cmp r0, #0
bgt _0209C9A0
ldr r0, [r7, #8]
@ -5077,7 +5077,7 @@ _0209CA08:
add r0, sb, #0x84
add r1, sb, #0x8a
add r2, sp, #0x4a
bl sub_020CCF18
bl VEC_Fx16CrossProduct
ldrsh r1, [sp, #0x4c]
ldrsh r0, [sp, #0x4e]
ldrsh r2, [sp, #0x4a]
@ -5086,7 +5086,7 @@ _0209CA08:
add r0, sp, #0x88
add r1, r7, #8
str r2, [sp, #0x88]
bl sub_020CCE14
bl VEC_DotProduct
cmp r0, #0
bge _0209CA70
ldr r0, [r7, #8]
@ -5335,7 +5335,7 @@ _0209CCD0:
add r0, sp, #0xb8
add r1, sp, #0xac
str r2, [sp, #0xc0]
bl sub_020CCFE0
bl VEC_Normalize
b _0209CE58
_0209CE1C:
ldr r0, [r7, #8]
@ -5353,7 +5353,7 @@ _0209CE1C:
_0209CE4C:
add r0, r7, #8
add r1, sp, #0xac
bl sub_020CCFE0
bl VEC_Normalize
_0209CE58:
ldr r2, [sp, #0xac]
ldr r1, [sp, #0x10]
@ -5607,10 +5607,10 @@ sub_0209D1FC: ; 0x0209D1FC
add r2, sp, #0
add r0, r4, #0x84
add r1, r4, #0x8a
bl sub_020CCF18
bl VEC_Fx16CrossProduct
add r0, sp, #0
mov r1, r0
bl sub_020CD0F8
bl VEC_Fx16Normalize
ldrsh r1, [sp]
ldr lr, [r5, #8]
ldrsh r0, [r4, #0x84]
@ -5734,11 +5734,11 @@ _0209D3DC:
_0209D3F4:
add r1, sp, #6
add r0, r4, #0x50
bl sub_020CD0F8
bl VEC_Fx16Normalize
_0209D400:
add r0, sp, #0
add r1, sp, #6
bl sub_020CCE50
bl VEC_Fx16DotProduct
cmp r0, #0x1000
beq _0209D424
mov r1, #0x1000
@ -5851,10 +5851,10 @@ _0209D438:
sub r1, r6, r2
strh r1, [r4, #0x8e]
mov r1, r0
bl sub_020CD0F8
bl VEC_Fx16Normalize
add r0, r4, #0x8a
mov r1, r0
bl sub_020CD0F8
bl VEC_Fx16Normalize
add sp, sp, #0x10
ldmia sp!, {r4, r5, r6, lr}
bx lr
@ -6311,7 +6311,7 @@ _0209DC00:
mov r2, r1, lsl #1
ldrsh r1, [r3, ip]
ldrsh r2, [r3, r2]
bl sub_020CB0D0
bl MTX_RotX33_
b _0209DC8C
_0209DC30:
ldrh r1, [r0]
@ -6324,7 +6324,7 @@ _0209DC30:
mov r2, r1, lsl #1
ldrsh r1, [r3, ip]
ldrsh r2, [r3, r2]
bl sub_020CB0EC
bl MTX_RotY33_
b _0209DC8C
_0209DC60:
ldrh r1, [r0]
@ -6337,12 +6337,12 @@ _0209DC60:
mov r2, r1, lsl #1
ldrsh r1, [r3, ip]
ldrsh r2, [r3, r2]
bl sub_020CB108
bl MTX_RotZ33_
_0209DC8C:
add r0, r4, #8
add r1, sp, #0
mov r2, r0
bl sub_020CB630
bl MTX_MultVec33
add sp, sp, #0x28
ldmia sp!, {r4, lr}
bx lr
@ -6566,7 +6566,7 @@ sub_0209DF48: ; 0x0209DF48
mov r2, r2, asr #8
str r2, [r0, #4]
str lr, [r0, #8]
bl sub_020CCFE0
bl VEC_Normalize
ldmia sp!, {r4, lr}
bx lr
.align 2, 0
@ -6597,7 +6597,7 @@ sub_0209DFA4: ; 0x0209DFA4
str r2, [ip]
mov r2, r2, asr #8
str r2, [r0, #8]
bl sub_020CCFE0
bl VEC_Normalize
ldmia sp!, {r4, lr}
bx lr
.align 2, 0