Match most files in overlay116

This commit is contained in:
Nomura
2023-01-01 22:11:52 +01:00
parent d8b3ae2f10
commit 87d7b5e80c
18 changed files with 3474 additions and 9265 deletions

View File

@@ -1,6 +0,0 @@
.public sub_0201D2DC
.public sub_02032798
.public ov116_0226049C
.public ov116_022604A4
.public ov116_022617D4
.public ov116_022617DC

View File

@@ -1,126 +0,0 @@
.include "macros/function.inc"
.include "overlay116/ov116_02260440.inc"
.text
thumb_func_start ov116_02260440
ov116_02260440: ; 0x02260440
push {r4, lr}
ldr r1, [r2, #0]
ldr r0, [r2, #4]
add r4, r3, #0
str r1, [r4, #0x14]
str r0, [r4, #0x18]
bl sub_0201D2DC
add r0, r4, #0
bl ov116_022617D4
pop {r4, pc}
thumb_func_end ov116_02260440
thumb_func_start ov116_02260458
ov116_02260458: ; 0x02260458
add r0, r3, #0
ldr r3, _02260460 ; =ov116_022617DC
bx r3
nop
_02260460: .word ov116_022617DC
thumb_func_end ov116_02260458
thumb_func_start ov116_02260464
ov116_02260464: ; 0x02260464
ldr r1, [r3, #4]
lsl r0, r0, #2
add r1, r1, r0
ldr r2, [r2, #0]
ldr r0, _02260474 ; =0x00002B9C
str r2, [r1, r0]
bx lr
nop
_02260474: .word 0x00002B9C
thumb_func_end ov116_02260464
thumb_func_start ov116_02260478
ov116_02260478: ; 0x02260478
lsl r0, r0, #3
ldr r1, [r2, #0]
add r0, r3, r0
str r1, [r0, #0x24]
bx lr
; .align 2, 0
thumb_func_end ov116_02260478
thumb_func_start ov116_02260484
ov116_02260484: ; 0x02260484
bx lr
; .align 2, 0
thumb_func_end ov116_02260484
thumb_func_start ov116_02260488
ov116_02260488: ; 0x02260488
mov r0, #0
bx lr
thumb_func_end ov116_02260488
thumb_func_start ov116_0226048C
ov116_0226048C: ; 0x0226048C
mov r0, #8
bx lr
thumb_func_end ov116_0226048C
thumb_func_start ov116_02260490
ov116_02260490: ; 0x02260490
mov r0, #4
bx lr
thumb_func_end ov116_02260490
thumb_func_start ov116_02260494
ov116_02260494: ; 0x02260494
mov r0, #8
bx lr
thumb_func_end ov116_02260494
thumb_func_start ov116_02260498
ov116_02260498: ; 0x02260498
mov r0, #0x20
bx lr
thumb_func_end ov116_02260498
thumb_func_start ov116_0226049C
ov116_0226049C: ; 0x0226049C
ldr r0, _022604A0 ; =0x02267740
bx lr
; .align 2, 0
_022604A0: .word 0x02267740
thumb_func_end ov116_0226049C
thumb_func_start ov116_022604A4
ov116_022604A4: ; 0x022604A4
mov r0, #5
bx lr
thumb_func_end ov116_022604A4
thumb_func_start ov116_022604A8
ov116_022604A8: ; 0x022604A8
push {r3, r4, r5, lr}
add r5, r0, #0
bl ov116_0226049C
add r4, r0, #0
bl ov116_022604A4
add r1, r0, #0
add r0, r4, #0
add r2, r5, #0
bl sub_02032798
pop {r3, r4, r5, pc}
; .align 2, 0
thumb_func_end ov116_022604A8
.rodata
.global Unk_ov116_02267740
Unk_ov116_02267740: ; 0x02267740
.incbin "incbin/overlay116_rodata.bin", 0x0, 0x3C

View File

@@ -1,167 +0,0 @@
.public sub_02002F38
.public sub_02002F54
.public sub_02002F70
.public sub_02002FA0
.public sub_02002FBC
.public sub_02003070
.public sub_02003694
.public sub_02003858
.public sub_02005748
.public sub_020057A4
.public sub_020057D4
.public sub_0200681C
.public sub_0200682C
.public sub_02006830
.public sub_02006840
.public sub_02006C24
.public sub_02006CA8
.public sub_0200964C
.public sub_0200966C
.public sub_02009704
.public sub_0200C6E4
.public sub_0200C704
.public sub_0200C738
.public sub_0200C73C
.public sub_0200C7C0
.public sub_0200C800
.public sub_0200C8D4
.public sub_0200CB30
.public sub_0200D0B0
.public sub_0200D33C
.public sub_0200D370
.public sub_0200D37C
.public sub_0200D3E0
.public sub_0200D3F4
.public sub_0200D4C4
.public sub_0200D9B0
.public sub_0200F174
.public sub_0200F2AC
.public sub_0200F2C0
.public sub_0200F370
.public sub_02017164
.public sub_020171A0
.public sub_02017240
.public sub_0201727C
.public sub_02017348
.public sub_02017798
.public sub_020177A4
.public sub_02017FC8
.public sub_0201807C
.public sub_020181C4
.public sub_020182CC
.public sub_02018340
.public sub_02018368
.public sub_020183C4
.public sub_02019044
.public sub_02019690
.public sub_02019EBC
.public sub_0201C2B8
.public sub_0201D2D0
.public sub_0201D2DC
.public sub_0201DBEC
.public sub_0201DC3C
.public sub_0201DCAC
.public sub_0201E3D8
.public sub_0201E450
.public sub_0201E530
.public sub_0201FE94
.public sub_0201FF00
.public sub_0201FF0C
.public sub_0201FF74
.public sub_0201FFE8
.public sub_020203AC
.public sub_020203B8
.public GF_AssertFail
.public sub_02024220
.public sub_020242C4
.public sub_02032E64
.public sub_02032EE8
.public sub_020359DC
.public sub_02035E18
.public sub_0203608C
.public sub_020364F0
.public sub_02036540
.public sub_020388F4
.public sub_020394A8
.public sub_02039734
.public NNS_G2dGetUnpackedPaletteData
.public MTX_MultVec43
.public G2x_SetBlendAlpha_
.public G3X_SetEdgeColorTable
.public MIi_CpuClear32
.public memset
.public _f_add
.public _f_ftoi
.public _f_itof
.public _f_sub
.public _s32_div_f
.public ov4_021D1E74
.public ov4_021D1F18
.public ov114_0225C700
.public ov114_0225C820
.public ov114_0225C838
.public ov114_0225C8BC
.public ov114_0225C8CC
.public ov114_0225C8EC
.public ov114_0225C904
.public ov114_0225C9A0
.public ov114_0225C9A4
.public ov114_0225C9A8
.public ov114_0225CA54
.public ov114_0225CA98
.public ov114_0225CAD4
.public ov114_0225CB38
.public ov114_0225CB8C
.public ov114_0225CBB0
.public ov114_0225CBE0
.public ov116_022604A8
.public ov116_022604C4
.public ov116_02260A2C
.public ov116_02260B6C
.public ov116_022610FC
.public ov116_02261244
.public ov116_022612CC
.public ov116_0226139C
.public ov116_02261494
.public ov116_022616CC
.public ov116_02261768
.public ov116_0226178C
.public ov116_02261794
.public ov116_022617C4
.public ov116_022617E4
.public ov116_022618A8
.public ov116_022618B4
.public ov116_0226192C
.public ov116_02261940
.public ov116_02261C88
.public ov116_02261D08
.public ov116_02261D70
.public ov116_02261DF0
.public ov116_02261E40
.public ov116_02261F08
.public ov116_02261F3C
.public ov116_02261F70
.public ov116_02262004
.public ov116_02262034
.public ov116_022620AC
.public ov116_02262264
.public ov116_022622C8
.public ov116_022625A8
.public ov116_02262724
.public ov116_0226281C
.public ov116_02262840
.public ov116_022628AC
.public ov116_022628B8
.public ov116_02262A44
.public ov116_02262A6C
.public ov116_02262A74
.public ov116_02262A8C
.public ov116_02262C64
.public ov116_02263B30
.public ov116_0226432C
.public ov116_0226452C
.public ov116_02264680
.public ov116_0226493C
.public ov116_02265470
.public ov116_02265A1C
.public ov116_02266FEC

File diff suppressed because it is too large Load Diff

View File

@@ -1,2 +0,0 @@
.public sub_02018144
.public sub_020181C4

View File

@@ -1,56 +0,0 @@
.include "macros/function.inc"
.include "overlay116/ov116_02262A44.inc"
.text
thumb_func_start ov116_02262A44
ov116_02262A44: ; 0x02262A44
push {r3, r4, r5, lr}
add r5, r0, #0
add r4, r1, #0
mov r0, #0x6a
mov r1, #0x10
bl sub_02018144
add r3, r0, #0
mov r2, #0x10
mov r1, #0
_02262A58:
strb r1, [r3]
add r3, r3, #1
sub r2, r2, #1
bne _02262A58
mov r1, #0x4b
str r5, [r0, #4]
lsl r1, r1, #4
strh r1, [r0, #8]
str r4, [r0, #0xc]
pop {r3, r4, r5, pc}
thumb_func_end ov116_02262A44
thumb_func_start ov116_02262A6C
ov116_02262A6C: ; 0x02262A6C
ldr r3, _02262A70 ; =sub_020181C4
bx r3
; .align 2, 0
_02262A70: .word sub_020181C4
thumb_func_end ov116_02262A6C
thumb_func_start ov116_02262A74
ov116_02262A74: ; 0x02262A74
mov r1, #8
ldrsh r2, [r0, r1]
sub r2, r2, #1
strh r2, [r0, #8]
ldrsh r0, [r0, r1]
cmp r0, #0
ble _02262A86
mov r0, #1
bx lr
_02262A86:
mov r0, #0
bx lr
; .align 2, 0
thumb_func_end ov116_02262A74

View File

@@ -1,75 +0,0 @@
.public sub_02003A2C
.public sub_02005748
.public sub_020057A4
.public sub_0200D0F4
.public sub_0200D330
.public sub_0200D33C
.public sub_0200D364
.public sub_0200D3F4
.public sub_0200D430
.public sub_0200D4C4
.public sub_0200D550
.public sub_0200D614
.public sub_0200D638
.public sub_0200D650
.public sub_0200D67C
.public sub_0200D9E8
.public sub_0200DA58
.public sub_0200F2AC
.public sub_02017240
.public sub_02017348
.public sub_02018144
.public sub_020181C4
.public sub_0201C63C
.public sub_0201D250
.public sub_0201D264
.public FX_Div
.public FX_Sqrt
.public FX_SinFx64c
.public FX_CosFx64c
.public _d_dtof
.public _d_itod
.public _d_mul
.public _f_add
.public _d_fne
.public _f_fgt
.public _fdiv
.public _f_ftod
.public _f_ftoi
.public _f_itof
.public _f_utof
.public _f_lltof
.public _f_mul
.public _f_sub
.public _ull_mul
.public _s32_div_f
.public ov116_02261E0C
.public ov116_02261E28
.public ov116_022626E8
.public ov116_0226469C
.public ov116_022646FC
.public ov116_02264764
.public ov116_02264774
.public ov116_022647BC
.public ov116_022649E4
.public ov116_02264FEC
.public ov116_0226501C
.public ov116_0226510C
.public ov116_02265260
.public ov116_022652F4
.public ov116_0226534C
.public ov116_022655DC
.public ov116_02265754
.public ov116_022658C8
.public ov116_0226591C
.public ov116_02265D84
.public ov116_02265D8C
.public ov116_02265E64
.public ov116_02265F1C
.public ov116_02265FD4
.public ov116_02266FFC
.public ov116_0226700C
.public ov116_02267160
.public ov116_022671B8
.public ov116_022671EC
.public ov116_02267728

File diff suppressed because it is too large Load Diff

View File

@@ -1,15 +0,0 @@
.public MTX_Copy44To43_
.public FX_Sqrt
.public _d_dtof
.public _d_mul
.public _dsub
.public _f_add
.public _f_fgt
.public _fdiv
.public _f_ftod
.public _f_ftoi
.public _f_itof
.public _f_mul
.public _f_sub
.public ov116_0226711C
.public ov116_022673FC

View File

@@ -1,809 +0,0 @@
.include "macros/function.inc"
.include "overlay116/ov116_02266FEC.inc"
.text
thumb_func_start ov116_02266FEC
ov116_02266FEC: ; 0x02266FEC
mov r1, #0xfe
lsl r1, r1, #0x16
str r1, [r0, #0]
mov r1, #0
str r1, [r0, #4]
str r1, [r0, #8]
str r1, [r0, #0xc]
bx lr
thumb_func_end ov116_02266FEC
thumb_func_start ov116_02266FFC
ov116_02266FFC: ; 0x02266FFC
add r3, r0, #0
add r2, r1, #0
ldmia r2!, {r0, r1}
stmia r3!, {r0, r1}
ldmia r2!, {r0, r1}
stmia r3!, {r0, r1}
bx lr
; .align 2, 0
thumb_func_end ov116_02266FFC
thumb_func_start ov116_0226700C
ov116_0226700C: ; 0x0226700C
push {r3, r4, r5, r6, r7, lr}
sub sp, #0x10
add r5, r1, #0
add r4, r2, #0
add r6, r0, #0
ldr r0, [r5, #0]
ldr r1, [r4, #0]
bl _f_mul
add r7, r0, #0
ldr r0, [r5, #4]
ldr r1, [r4, #4]
bl _f_mul
add r1, r0, #0
add r0, r7, #0
bl _f_sub
add r7, r0, #0
ldr r0, [r5, #8]
ldr r1, [r4, #8]
bl _f_mul
add r1, r0, #0
add r0, r7, #0
bl _f_sub
add r7, r0, #0
ldr r0, [r5, #0xc]
ldr r1, [r4, #0xc]
bl _f_mul
add r1, r0, #0
add r0, r7, #0
bl _f_sub
str r0, [r6, #0]
ldr r0, [r5, #8]
ldr r1, [r4, #0xc]
bl _f_mul
add r7, r0, #0
ldr r0, [r5, #0]
ldr r1, [r4, #4]
bl _f_mul
str r0, [sp]
ldr r0, [r5, #4]
ldr r1, [r4, #0]
bl _f_mul
add r1, r0, #0
ldr r0, [sp]
bl _f_add
add r1, r0, #0
add r0, r7, #0
bl _f_add
add r7, r0, #0
ldr r0, [r5, #0xc]
ldr r1, [r4, #8]
bl _f_mul
add r1, r0, #0
add r0, r7, #0
bl _f_sub
str r0, [r6, #4]
ldr r0, [r5, #0xc]
ldr r1, [r4, #4]
bl _f_mul
add r7, r0, #0
ldr r0, [r5, #8]
ldr r1, [r4, #0]
bl _f_mul
str r0, [sp, #4]
ldr r0, [r5, #0]
ldr r1, [r4, #8]
bl _f_mul
str r0, [sp, #8]
ldr r0, [r5, #4]
ldr r1, [r4, #0xc]
bl _f_mul
add r1, r0, #0
ldr r0, [sp, #8]
bl _f_sub
add r1, r0, #0
ldr r0, [sp, #4]
bl _f_add
add r1, r0, #0
add r0, r7, #0
bl _f_add
str r0, [r6, #8]
ldr r0, [r5, #0xc]
ldr r1, [r4, #0]
bl _f_mul
str r0, [sp, #0xc]
ldr r0, [r5, #0]
ldr r1, [r4, #0xc]
bl _f_mul
add r7, r0, #0
ldr r0, [r5, #4]
ldr r1, [r4, #8]
bl _f_mul
add r1, r0, #0
add r0, r7, #0
bl _f_add
add r7, r0, #0
ldr r0, [r5, #8]
ldr r1, [r4, #4]
bl _f_mul
add r1, r0, #0
add r0, r7, #0
bl _f_sub
add r1, r0, #0
ldr r0, [sp, #0xc]
bl _f_add
str r0, [r6, #0xc]
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
; .align 2, 0
thumb_func_end ov116_0226700C
thumb_func_start ov116_0226711C
ov116_0226711C: ; 0x0226711C
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
ldr r0, [r5, #0xc]
add r1, r0, #0
bl _f_add
add r4, r0, #0
ldr r0, [r5, #8]
add r1, r0, #0
bl _f_add
add r6, r0, #0
ldr r0, [r5, #0]
add r1, r0, #0
bl _f_mul
add r7, r0, #0
ldr r0, [r5, #4]
add r1, r0, #0
bl _f_add
add r1, r0, #0
add r0, r7, #0
bl _f_add
add r1, r0, #0
add r0, r6, #0
bl _f_add
add r1, r0, #0
add r0, r4, #0
bl _f_add
pop {r3, r4, r5, r6, r7, pc}
thumb_func_end ov116_0226711C
thumb_func_start ov116_02267160
ov116_02267160: ; 0x02267160
push {r4, lr}
add r4, r0, #0
bl ov116_0226711C
mov r1, #0
bl _f_fgt
bls _0226718A
add r0, r4, #0
bl ov116_0226711C
add r1, r0, #0
ldr r0, _022671B4 ; =0x45800000
bl _f_mul
add r1, r0, #0
mov r0, #0x3f
lsl r0, r0, #0x18
bl _f_add
b _022671A0
_0226718A:
add r0, r4, #0
bl ov116_0226711C
add r1, r0, #0
ldr r0, _022671B4 ; =0x45800000
bl _f_mul
mov r1, #0x3f
lsl r1, r1, #0x18
bl _f_sub
_022671A0:
bl _f_ftoi
bl FX_Sqrt
bl _f_itof
ldr r1, _022671B4 ; =0x45800000
bl _fdiv
pop {r4, pc}
; .align 2, 0
_022671B4: .word 0x45800000
thumb_func_end ov116_02267160
thumb_func_start ov116_022671B8
ov116_022671B8: ; 0x022671B8
push {r4, r5, r6, lr}
add r4, r1, #0
add r5, r0, #0
add r6, r2, #0
ldr r0, [r4, #0]
add r1, r6, #0
bl _fdiv
str r0, [r5, #0]
ldr r0, [r4, #4]
add r1, r6, #0
bl _fdiv
str r0, [r5, #4]
ldr r0, [r4, #8]
add r1, r6, #0
bl _fdiv
str r0, [r5, #8]
ldr r0, [r4, #0xc]
add r1, r6, #0
bl _fdiv
str r0, [r5, #0xc]
pop {r4, r5, r6, pc}
; .align 2, 0
thumb_func_end ov116_022671B8
thumb_func_start ov116_022671EC
ov116_022671EC: ; 0x022671EC
push {r4, r5, r6, r7, lr}
sub sp, #0x24
add r5, r1, #0
add r4, r0, #0
ldr r0, [r5, #4]
add r1, r0, #0
bl _f_mul
bl _f_ftod
add r3, r1, #0
mov r1, #1
add r2, r0, #0
mov r0, #0
lsl r1, r1, #0x1e
bl _d_mul
bl _d_dtof
str r0, [sp, #8]
ldr r0, [r5, #8]
add r1, r0, #0
bl _f_mul
bl _f_ftod
add r3, r1, #0
mov r1, #1
add r2, r0, #0
mov r0, #0
lsl r1, r1, #0x1e
bl _d_mul
bl _d_dtof
str r0, [sp, #0xc]
ldr r0, [r5, #0xc]
add r1, r0, #0
bl _f_mul
bl _f_ftod
add r3, r1, #0
mov r1, #1
add r2, r0, #0
mov r0, #0
lsl r1, r1, #0x1e
bl _d_mul
bl _d_dtof
add r6, r0, #0
ldr r0, [r5, #4]
ldr r1, [r5, #8]
bl _f_mul
bl _f_ftod
add r3, r1, #0
mov r1, #1
add r2, r0, #0
mov r0, #0
lsl r1, r1, #0x1e
bl _d_mul
bl _d_dtof
str r0, [sp, #0x10]
ldr r0, [r5, #8]
ldr r1, [r5, #0xc]
bl _f_mul
bl _f_ftod
add r3, r1, #0
mov r1, #1
add r2, r0, #0
mov r0, #0
lsl r1, r1, #0x1e
bl _d_mul
bl _d_dtof
str r0, [sp, #0x14]
ldr r0, [r5, #0xc]
ldr r1, [r5, #4]
bl _f_mul
bl _f_ftod
add r3, r1, #0
mov r1, #1
add r2, r0, #0
mov r0, #0
lsl r1, r1, #0x1e
bl _d_mul
bl _d_dtof
str r0, [sp, #0x18]
ldr r0, [r5, #4]
ldr r1, [r5, #0]
bl _f_mul
bl _f_ftod
add r3, r1, #0
mov r1, #1
add r2, r0, #0
mov r0, #0
lsl r1, r1, #0x1e
bl _d_mul
bl _d_dtof
str r0, [sp, #0x1c]
ldr r0, [r5, #8]
ldr r1, [r5, #0]
bl _f_mul
bl _f_ftod
add r3, r1, #0
mov r1, #1
add r2, r0, #0
mov r0, #0
lsl r1, r1, #0x1e
bl _d_mul
bl _d_dtof
add r7, r0, #0
ldr r0, [r5, #0xc]
ldr r1, [r5, #0]
bl _f_mul
bl _f_ftod
add r3, r1, #0
mov r1, #1
add r2, r0, #0
mov r0, #0
lsl r1, r1, #0x1e
bl _d_mul
bl _d_dtof
add r5, r0, #0
ldr r0, [sp, #0xc]
bl _f_ftod
add r3, r1, #0
add r2, r0, #0
ldr r1, _022673F8 ; =0x3FF00000
mov r0, #0
bl _dsub
str r0, [sp, #0x20]
str r1, [sp, #4]
add r0, r6, #0
bl _f_ftod
add r2, r0, #0
add r3, r1, #0
ldr r0, [sp, #0x20]
ldr r1, [sp, #4]
bl _dsub
bl _d_dtof
str r0, [r4, #0]
ldr r0, [sp, #0x10]
add r1, r5, #0
bl _f_add
str r0, [r4, #4]
ldr r0, [sp, #0x18]
add r1, r7, #0
bl _f_sub
str r0, [r4, #8]
mov r0, #0
str r0, [r4, #0xc]
ldr r0, [sp, #0x10]
add r1, r5, #0
bl _f_sub
str r0, [r4, #0x10]
add r0, r6, #0
bl _f_ftod
add r3, r1, #0
add r2, r0, #0
ldr r1, _022673F8 ; =0x3FF00000
mov r0, #0
bl _dsub
add r6, r0, #0
ldr r0, [sp, #8]
add r5, r1, #0
bl _f_ftod
add r2, r0, #0
add r3, r1, #0
add r0, r6, #0
add r1, r5, #0
bl _dsub
bl _d_dtof
str r0, [r4, #0x14]
ldr r0, [sp, #0x14]
ldr r1, [sp, #0x1c]
bl _f_add
str r0, [r4, #0x18]
mov r0, #0
str r0, [r4, #0x1c]
ldr r0, [sp, #0x18]
add r1, r7, #0
bl _f_add
str r0, [r4, #0x20]
ldr r0, [sp, #0x14]
ldr r1, [sp, #0x1c]
bl _f_sub
str r0, [r4, #0x24]
ldr r0, [sp, #8]
bl _f_ftod
add r3, r1, #0
add r2, r0, #0
ldr r1, _022673F8 ; =0x3FF00000
mov r0, #0
bl _dsub
add r6, r0, #0
ldr r0, [sp, #0xc]
add r5, r1, #0
bl _f_ftod
add r2, r0, #0
add r3, r1, #0
add r0, r6, #0
add r1, r5, #0
bl _dsub
bl _d_dtof
str r0, [r4, #0x28]
mov r0, #0
str r0, [r4, #0x2c]
str r0, [r4, #0x30]
str r0, [r4, #0x34]
str r0, [r4, #0x38]
mov r0, #0xfe
lsl r0, r0, #0x16
str r0, [r4, #0x3c]
add sp, #0x24
pop {r4, r5, r6, r7, pc}
nop
_022673F8: .word 0x3FF00000
thumb_func_end ov116_022671EC
thumb_func_start ov116_022673FC
ov116_022673FC: ; 0x022673FC
push {r3, r4, r5, lr}
add r5, r0, #0
ldr r0, [r5, #0]
add r4, r1, #0
mov r1, #0
bl _f_fgt
ldr r0, _02267724 ; =0x45800000
bls _02267420
ldr r1, [r5, #0]
bl _f_mul
add r1, r0, #0
mov r0, #0x3f
lsl r0, r0, #0x18
bl _f_add
b _0226742E
_02267420:
ldr r1, [r5, #0]
bl _f_mul
mov r1, #0x3f
lsl r1, r1, #0x18
bl _f_sub
_0226742E:
bl _f_ftoi
str r0, [r4, #0]
ldr r0, [r5, #4]
mov r1, #0
bl _f_fgt
ldr r0, _02267724 ; =0x45800000
bls _02267452
ldr r1, [r5, #4]
bl _f_mul
add r1, r0, #0
mov r0, #0x3f
lsl r0, r0, #0x18
bl _f_add
b _02267460
_02267452:
ldr r1, [r5, #4]
bl _f_mul
mov r1, #0x3f
lsl r1, r1, #0x18
bl _f_sub
_02267460:
bl _f_ftoi
str r0, [r4, #4]
ldr r0, [r5, #8]
mov r1, #0
bl _f_fgt
ldr r0, _02267724 ; =0x45800000
bls _02267484
ldr r1, [r5, #8]
bl _f_mul
add r1, r0, #0
mov r0, #0x3f
lsl r0, r0, #0x18
bl _f_add
b _02267492
_02267484:
ldr r1, [r5, #8]
bl _f_mul
mov r1, #0x3f
lsl r1, r1, #0x18
bl _f_sub
_02267492:
bl _f_ftoi
str r0, [r4, #8]
ldr r0, [r5, #0xc]
mov r1, #0
bl _f_fgt
ldr r0, _02267724 ; =0x45800000
bls _022674B6
ldr r1, [r5, #0xc]
bl _f_mul
add r1, r0, #0
mov r0, #0x3f
lsl r0, r0, #0x18
bl _f_add
b _022674C4
_022674B6:
ldr r1, [r5, #0xc]
bl _f_mul
mov r1, #0x3f
lsl r1, r1, #0x18
bl _f_sub
_022674C4:
bl _f_ftoi
str r0, [r4, #0xc]
ldr r0, [r5, #0x10]
mov r1, #0
bl _f_fgt
ldr r0, _02267724 ; =0x45800000
bls _022674E8
ldr r1, [r5, #0x10]
bl _f_mul
add r1, r0, #0
mov r0, #0x3f
lsl r0, r0, #0x18
bl _f_add
b _022674F6
_022674E8:
ldr r1, [r5, #0x10]
bl _f_mul
mov r1, #0x3f
lsl r1, r1, #0x18
bl _f_sub
_022674F6:
bl _f_ftoi
str r0, [r4, #0x10]
ldr r0, [r5, #0x14]
mov r1, #0
bl _f_fgt
ldr r0, _02267724 ; =0x45800000
bls _0226751A
ldr r1, [r5, #0x14]
bl _f_mul
add r1, r0, #0
mov r0, #0x3f
lsl r0, r0, #0x18
bl _f_add
b _02267528
_0226751A:
ldr r1, [r5, #0x14]
bl _f_mul
mov r1, #0x3f
lsl r1, r1, #0x18
bl _f_sub
_02267528:
bl _f_ftoi
str r0, [r4, #0x14]
ldr r0, [r5, #0x18]
mov r1, #0
bl _f_fgt
ldr r0, _02267724 ; =0x45800000
bls _0226754C
ldr r1, [r5, #0x18]
bl _f_mul
add r1, r0, #0
mov r0, #0x3f
lsl r0, r0, #0x18
bl _f_add
b _0226755A
_0226754C:
ldr r1, [r5, #0x18]
bl _f_mul
mov r1, #0x3f
lsl r1, r1, #0x18
bl _f_sub
_0226755A:
bl _f_ftoi
str r0, [r4, #0x18]
ldr r0, [r5, #0x1c]
mov r1, #0
bl _f_fgt
ldr r0, _02267724 ; =0x45800000
bls _0226757E
ldr r1, [r5, #0x1c]
bl _f_mul
add r1, r0, #0
mov r0, #0x3f
lsl r0, r0, #0x18
bl _f_add
b _0226758C
_0226757E:
ldr r1, [r5, #0x1c]
bl _f_mul
mov r1, #0x3f
lsl r1, r1, #0x18
bl _f_sub
_0226758C:
bl _f_ftoi
str r0, [r4, #0x1c]
ldr r0, [r5, #0x20]
mov r1, #0
bl _f_fgt
ldr r0, _02267724 ; =0x45800000
bls _022675B0
ldr r1, [r5, #0x20]
bl _f_mul
add r1, r0, #0
mov r0, #0x3f
lsl r0, r0, #0x18
bl _f_add
b _022675BE
_022675B0:
ldr r1, [r5, #0x20]
bl _f_mul
mov r1, #0x3f
lsl r1, r1, #0x18
bl _f_sub
_022675BE:
bl _f_ftoi
str r0, [r4, #0x20]
ldr r0, [r5, #0x24]
mov r1, #0
bl _f_fgt
ldr r0, _02267724 ; =0x45800000
bls _022675E2
ldr r1, [r5, #0x24]
bl _f_mul
add r1, r0, #0
mov r0, #0x3f
lsl r0, r0, #0x18
bl _f_add
b _022675F0
_022675E2:
ldr r1, [r5, #0x24]
bl _f_mul
mov r1, #0x3f
lsl r1, r1, #0x18
bl _f_sub
_022675F0:
bl _f_ftoi
str r0, [r4, #0x24]
ldr r0, [r5, #0x28]
mov r1, #0
bl _f_fgt
ldr r0, _02267724 ; =0x45800000
bls _02267614
ldr r1, [r5, #0x28]
bl _f_mul
add r1, r0, #0
mov r0, #0x3f
lsl r0, r0, #0x18
bl _f_add
b _02267622
_02267614:
ldr r1, [r5, #0x28]
bl _f_mul
mov r1, #0x3f
lsl r1, r1, #0x18
bl _f_sub
_02267622:
bl _f_ftoi
str r0, [r4, #0x28]
ldr r0, [r5, #0x2c]
mov r1, #0
bl _f_fgt
ldr r0, _02267724 ; =0x45800000
bls _02267646
ldr r1, [r5, #0x2c]
bl _f_mul
add r1, r0, #0
mov r0, #0x3f
lsl r0, r0, #0x18
bl _f_add
b _02267654
_02267646:
ldr r1, [r5, #0x2c]
bl _f_mul
mov r1, #0x3f
lsl r1, r1, #0x18
bl _f_sub
_02267654:
bl _f_ftoi
str r0, [r4, #0x2c]
ldr r0, [r5, #0x30]
mov r1, #0
bl _f_fgt
ldr r0, _02267724 ; =0x45800000
bls _02267678
ldr r1, [r5, #0x30]
bl _f_mul
add r1, r0, #0
mov r0, #0x3f
lsl r0, r0, #0x18
bl _f_add
b _02267686
_02267678:
ldr r1, [r5, #0x30]
bl _f_mul
mov r1, #0x3f
lsl r1, r1, #0x18
bl _f_sub
_02267686:
bl _f_ftoi
str r0, [r4, #0x30]
ldr r0, [r5, #0x34]
mov r1, #0
bl _f_fgt
ldr r0, _02267724 ; =0x45800000
bls _022676AA
ldr r1, [r5, #0x34]
bl _f_mul
add r1, r0, #0
mov r0, #0x3f
lsl r0, r0, #0x18
bl _f_add
b _022676B8
_022676AA:
ldr r1, [r5, #0x34]
bl _f_mul
mov r1, #0x3f
lsl r1, r1, #0x18
bl _f_sub
_022676B8:
bl _f_ftoi
str r0, [r4, #0x34]
ldr r0, [r5, #0x38]
mov r1, #0
bl _f_fgt
ldr r0, _02267724 ; =0x45800000
bls _022676DC
ldr r1, [r5, #0x38]
bl _f_mul
add r1, r0, #0
mov r0, #0x3f
lsl r0, r0, #0x18
bl _f_add
b _022676EA
_022676DC:
ldr r1, [r5, #0x38]
bl _f_mul
mov r1, #0x3f
lsl r1, r1, #0x18
bl _f_sub
_022676EA:
bl _f_ftoi
str r0, [r4, #0x38]
ldr r0, [r5, #0x3c]
mov r1, #0
bl _f_fgt
ldr r0, _02267724 ; =0x45800000
bls _0226770E
ldr r1, [r5, #0x3c]
bl _f_mul
add r1, r0, #0
mov r0, #0x3f
lsl r0, r0, #0x18
bl _f_add
b _0226771C
_0226770E:
ldr r1, [r5, #0x3c]
bl _f_mul
mov r1, #0x3f
lsl r1, r1, #0x18
bl _f_sub
_0226771C:
bl _f_ftoi
str r0, [r4, #0x3c]
pop {r3, r4, r5, pc}
; .align 2, 0
_02267724: .word 0x45800000
thumb_func_end ov116_022673FC
thumb_func_start ov116_02267728
ov116_02267728: ; 0x02267728
push {r4, lr}
sub sp, #0x40
add r4, r1, #0
add r1, sp, #0
bl ov116_022673FC
add r0, sp, #0
add r1, r4, #0
bl MTX_Copy44To43_
add sp, #0x40
pop {r4, pc}
; .align 2, 0
thumb_func_end ov116_02267728

View File

@@ -4,8 +4,9 @@
.text
arm_func_start _dgeq
arm_func_start _d_fge
_dgeq:
_d_fge: ; 0x020E0D24
mov ip, #0x200000
cmn ip, r1, lsl #1

View File

@@ -5,8 +5,9 @@
.text
arm_func_start _ll_sto_f
arm_func_start _f_lltof
_ll_sto_f:
_f_lltof: ; 0x020E1844
ands r2, r1, #0x80000000
beq _020E1854

View File

@@ -2154,13 +2154,13 @@ Overlay overlay115
Overlay overlay116
{
After overlay114
Object asm/overlay116/ov116_02260440.o
Object asm/overlay116/ov116_022604C4.o
Object src/overlay116/ov116_02260440.o
Object src/overlay116/ov116_022604C4.o
Object asm/overlay116/ov116_02261870.o
Object asm/overlay116/ov116_02262A44.o
Object src/overlay116/ov116_02262A44.o
Object asm/overlay116/ov116_02262A8C.o
Object asm/overlay116/ov116_0226432C.o
Object asm/overlay116/ov116_02266FEC.o
Object src/overlay116/ov116_0226432C.o
Object src/overlay116/ov116_02266FEC.o
}
Overlay overlay117

View File

@@ -0,0 +1,112 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/struct_02039A58.h"
#include "overlay116/struct_ov116_0226048C.h"
#include "overlay116/struct_ov116_02260490.h"
#include "overlay116/struct_ov116_02260494.h"
#include "overlay116/struct_ov116_02260498.h"
#include "overlay116/struct_ov116_0226139C.h"
#include "unk_0201D15C.h"
#include "unk_02032798.h"
#include "overlay116/ov116_02260440.h"
#include "overlay116/ov116_022604C4.h"
static void ov116_02260440(int param0, int param1, void * param2, void * param3);
static void ov116_02260458(int param0, int param1, void * param2, void * param3);
static void ov116_02260464(int param0, int param1, void * param2, void * param3);
static void ov116_02260478(int param0, int param1, void * param2, void * param3);
static void ov116_02260484(int param0, int param1, void * param2, void * param3);
static int ov116_02260488(void);
static int ov116_0226048C(void);
static int ov116_02260490(void);
static int ov116_02260494(void);
static int ov116_02260498(void);
static const UnkStruct_02039A58 Unk_ov116_02267740[] = {
{ov116_02260440, ov116_0226048C, NULL},
{ov116_02260458, ov116_02260488, NULL},
{ov116_02260464, ov116_02260490, NULL},
{ov116_02260478, ov116_02260494, NULL},
{ov116_02260484, ov116_02260498, NULL}
};
static void ov116_02260440 (int param0, int param1, void * param2, void * param3)
{
UnkStruct_ov116_0226139C * v0 = param3;
v0->unk_14 = *((UnkStruct_ov116_0226048C *)param2);
sub_0201D2DC(v0->unk_14.unk_04);
ov116_022617D4(v0);
}
static void ov116_02260458 (int param0, int param1, void * param2, void * param3)
{
UnkStruct_ov116_0226139C * v0 = param3;
ov116_022617DC(v0);
}
static void ov116_02260464 (int param0, int param1, void * param2, void * param3)
{
UnkStruct_ov116_0226139C * v0 = param3;
UnkStruct_ov116_02260490 * v1;
v1 = ((UnkStruct_ov116_02260490 *)param2);
v0->unk_04->unk_2858[param0].unk_00 = v1->unk_00;
}
static void ov116_02260478 (int param0, int param1, void * param2, void * param3)
{
UnkStruct_ov116_0226139C * v0 = param3;
UnkStruct_ov116_02260494 * v1;
v1 = ((UnkStruct_ov116_02260494 *)param2);
v0->unk_24.unk_00[param0].unk_00 = v1->unk_00;
}
static void ov116_02260484 (int param0, int param1, void * param2, void * param3)
{
UnkStruct_ov116_0226139C * v0 = param3;
}
static int ov116_02260488 (void)
{
return 0;
}
static int ov116_0226048C (void)
{
return sizeof(UnkStruct_ov116_0226048C);
}
static int ov116_02260490 (void)
{
return sizeof(UnkStruct_ov116_02260490);
}
static int ov116_02260494 (void)
{
return sizeof(UnkStruct_ov116_02260494);
}
static int ov116_02260498 (void)
{
return sizeof(UnkStruct_ov116_02260498);
}
const UnkStruct_02039A58 * ov116_0226049C (void)
{
return Unk_ov116_02267740;
}
int ov116_022604A4 (void)
{
return sizeof(Unk_ov116_02267740) / sizeof(UnkStruct_02039A58);
}
void ov116_022604A8 (UnkStruct_ov116_0226139C * param0)
{
sub_02032798(ov116_0226049C(), ov116_022604A4(), param0);
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,35 @@
#include <nitro.h>
#include <string.h>
#include "overlay116/struct_ov116_02262A44.h"
#include "overlay116/struct_ov116_022649E4.h"
#include "unk_02017E74.h"
#include "overlay116/ov116_02262A44.h"
UnkStruct_ov116_02262A44 * ov116_02262A44 (int param0, UnkStruct_ov116_022649E4 * param1)
{
UnkStruct_ov116_02262A44 * v0 = sub_02018144(106, sizeof(UnkStruct_ov116_02262A44));
memset(v0, 0, sizeof(UnkStruct_ov116_02262A44));
v0->unk_04 = param0;
v0->unk_08 = ((30 * 40) - 0);
v0->unk_0C = param1;
return v0;
}
void ov116_02262A6C (UnkStruct_ov116_02262A44 * param0)
{
sub_020181C4(param0);
}
BOOL ov116_02262A74 (UnkStruct_ov116_02262A44 * param0)
{
if ((--param0->unk_08) <= 0) {
return 0;
}
return 1;
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,107 @@
#include <nitro.h>
#include <string.h>
#include "overlay116/union_ov116_02266FEC.h"
#include "overlay116/union_ov116_022671EC.h"
#include "overlay116/ov116_02266FEC.h"
void ov116_02266FEC (UnkUnion_ov116_02266FEC * param0)
{
param0->val1_00 = 1.0;
param0->val1_04 = 0;
param0->val1_08 = 0;
param0->val1_0C = 0;
}
void ov116_02266FFC (UnkUnion_ov116_02266FEC * param0, UnkUnion_ov116_02266FEC * param1)
{
*param0 = *param1;
}
void ov116_0226700C (UnkUnion_ov116_02266FEC * param0, const UnkUnion_ov116_02266FEC * param1, const UnkUnion_ov116_02266FEC * param2)
{
param0->val1_00 = (param1->val1_00 * param2->val1_00) - (param1->val1_04 * param2->val1_04) - (param1->val1_08 * param2->val1_08) - (param1->val1_0C * param2->val1_0C);
param0->val1_04 = (param1->val1_00 * param2->val1_04) + (param1->val1_04 * param2->val1_00) + (param1->val1_08 * param2->val1_0C) - (param1->val1_0C * param2->val1_08);
param0->val1_08 = (param1->val1_00 * param2->val1_08) - (param1->val1_04 * param2->val1_0C) + (param1->val1_08 * param2->val1_00) + (param1->val1_0C * param2->val1_04);
param0->val1_0C = (param1->val1_00 * param2->val1_0C) + (param1->val1_04 * param2->val1_08) - (param1->val1_08 * param2->val1_04) + (param1->val1_0C * param2->val1_00);
}
f32 ov116_0226711C (const UnkUnion_ov116_02266FEC * param0)
{
return (param0->val1_00 * param0->val1_00) + (param0->val1_04 + param0->val1_04) + (param0->val1_08 + param0->val1_08) + (param0->val1_0C + param0->val1_0C);
}
f32 ov116_02267160 (const UnkUnion_ov116_02266FEC * param0)
{
fx32 v0;
v0 = FX_F32_TO_FX32(ov116_0226711C(param0));
return FX_FX32_TO_F32(FX_Sqrt(v0));
}
void ov116_022671B8 (UnkUnion_ov116_02266FEC * param0, const UnkUnion_ov116_02266FEC * param1, f32 param2)
{
param0->val1_00 = param1->val1_00 / param2;
param0->val1_04 = param1->val1_04 / param2;
param0->val1_08 = param1->val1_08 / param2;
param0->val1_0C = param1->val1_0C / param2;
}
void ov116_022671EC (UnkUnion_ov116_022671EC * param0, const UnkUnion_ov116_02266FEC * param1)
{
f32 v0 = param1->val1_04 * param1->val1_04 * 2.0;
f32 v1 = param1->val1_08 * param1->val1_08 * 2.0;
f32 v2 = param1->val1_0C * param1->val1_0C * 2.0;
f32 v3 = param1->val1_04 * param1->val1_08 * 2.0;
f32 v4 = param1->val1_08 * param1->val1_0C * 2.0;
f32 v5 = param1->val1_0C * param1->val1_04 * 2.0;
f32 v6 = param1->val1_04 * param1->val1_00 * 2.0;
f32 v7 = param1->val1_08 * param1->val1_00 * 2.0;
f32 v8 = param1->val1_0C * param1->val1_00 * 2.0;
param0->val1_00 = 1.0 - v1 - v2;
param0->val1_04 = v3 + v8;
param0->val1_08 = v5 - v7;
param0->val1_0C = 0.0;
param0->val1_10 = v3 - v8;
param0->val1_14 = 1.0 - v2 - v0;
param0->val1_18 = v4 + v6;
param0->val1_1C = 0.0;
param0->val1_20 = v5 + v7;
param0->val1_24 = v4 - v6;
param0->val1_28 = 1.0 - v0 - v1;
param0->val1_2C = 0.0;
param0->val1_30 = 0.0;
param0->val1_34 = 0.0;
param0->val1_38 = 0.0;
param0->val1_3C = 1.0;
}
void ov116_022673FC (const UnkUnion_ov116_022671EC * param0, MtxFx44 * param1)
{
param1->_00 = FX32_CONST(param0->val1_00);
param1->_01 = FX32_CONST(param0->val1_04);
param1->_02 = FX32_CONST(param0->val1_08);
param1->_03 = FX32_CONST(param0->val1_0C);
param1->_10 = FX32_CONST(param0->val1_10);
param1->_11 = FX32_CONST(param0->val1_14);
param1->_12 = FX32_CONST(param0->val1_18);
param1->_13 = FX32_CONST(param0->val1_1C);
param1->_20 = FX32_CONST(param0->val1_20);
param1->_21 = FX32_CONST(param0->val1_24);
param1->_22 = FX32_CONST(param0->val1_28);
param1->_23 = FX32_CONST(param0->val1_2C);
param1->_30 = FX32_CONST(param0->val1_30);
param1->_31 = FX32_CONST(param0->val1_34);
param1->_32 = FX32_CONST(param0->val1_38);
param1->_33 = FX32_CONST(param0->val1_3C);
}
void ov116_02267728 (const UnkUnion_ov116_022671EC * param0, MtxFx43 * param1)
{
MtxFx44 v0;
ov116_022673FC(param0, &v0);
MTX_Copy44To43(&v0, param1);
}