This commit is contained in:
farisawan-2000 2020-12-22 23:29:25 -05:00
parent a0d4cc3610
commit 570c02ab59
4 changed files with 59 additions and 217 deletions

View File

@ -11537,128 +11537,3 @@ glabel func_8002D638
/* 02E2D8 8002D6D8 03E00008 */ jr $ra
/* 02E2DC 8002D6DC 00000000 */ nop
glabel sinf
/* 02E2E0 8002D6E0 E7AC0000 */ swc1 $f12, ($sp)
/* 02E2E4 8002D6E4 8FA20000 */ lw $v0, ($sp)
/* 02E2E8 8002D6E8 C7A40000 */ lwc1 $f4, ($sp)
/* 02E2EC 8002D6EC 00021D83 */ sra $v1, $v0, 0x16
/* 02E2F0 8002D6F0 306E01FF */ andi $t6, $v1, 0x1ff
/* 02E2F4 8002D6F4 29C100FF */ slti $at, $t6, 0xff
/* 02E2F8 8002D6F8 10200019 */ beqz $at, .L8002D760_ovl0
/* 02E2FC 8002D6FC 01C01825 */ move $v1, $t6
/* 02E300 8002D700 29C100E6 */ slti $at, $t6, 0xe6
/* 02E304 8002D704 14200014 */ bnez $at, .L8002D758_ovl0
/* 02E308 8002D708 460020A1 */ cvt.d.s $f2, $f4
/* 02E30C 8002D70C 46221302 */ mul.d $f12, $f2, $f2
/* 02E310 8002D710 3C038004 */ lui $v1, %hi(D_80041AB0) # $v1, 0x8004
/* 02E314 8002D714 24631AB0 */ addiu $v1, %lo(D_80041AB0) # addiu $v1, $v1, 0x1ab0
/* 02E318 8002D718 D4660020 */ ldc1 $f6, 0x20($v1)
/* 02E31C 8002D71C D46A0018 */ ldc1 $f10, 0x18($v1)
/* 02E320 8002D720 D4640010 */ ldc1 $f4, 0x10($v1)
/* 02E324 8002D724 462C3202 */ mul.d $f8, $f6, $f12
/* 02E328 8002D728 462A4400 */ add.d $f16, $f8, $f10
/* 02E32C 8002D72C D46A0008 */ ldc1 $f10, 8($v1)
/* 02E330 8002D730 462C8482 */ mul.d $f18, $f16, $f12
/* 02E334 8002D734 46249180 */ add.d $f6, $f18, $f4
/* 02E338 8002D738 462C3202 */ mul.d $f8, $f6, $f12
/* 02E33C 8002D73C 46285380 */ add.d $f14, $f10, $f8
/* 02E340 8002D740 462C1402 */ mul.d $f16, $f2, $f12
/* 02E344 8002D744 00000000 */ nop
/* 02E348 8002D748 462E8482 */ mul.d $f18, $f16, $f14
/* 02E34C 8002D74C 46229100 */ add.d $f4, $f18, $f2
/* 02E350 8002D750 03E00008 */ jr $ra
/* 02E354 8002D754 46202020 */ cvt.s.d $f0, $f4
.L8002D758_ovl0:
/* 02E358 8002D758 03E00008 */ jr $ra
/* 02E35C 8002D75C C7A00000 */ lwc1 $f0, ($sp)
.L8002D760_ovl0:
/* 02E360 8002D760 28610136 */ slti $at, $v1, 0x136
/* 02E364 8002D764 10200044 */ beqz $at, .L8002D878_ovl0
/* 02E368 8002D768 C7A40000 */ lwc1 $f4, ($sp)
/* 02E36C 8002D76C C7A60000 */ lwc1 $f6, ($sp)
/* 02E370 8002D770 3C018004 */ li $at, 0x80040000 # -0.000000
/* 02E374 8002D774 D42A1AD8 */ ldc1 $f10, 0x1ad8($at)
/* 02E378 8002D778 460030A1 */ cvt.d.s $f2, $f6
/* 02E37C 8002D77C 44804800 */ mtc1 $zero, $f9
/* 02E380 8002D780 462A1002 */ mul.d $f0, $f2, $f10
/* 02E384 8002D784 44804000 */ mtc1 $zero, $f8
/* 02E388 8002D788 3C013FE0 */ li $at, 0x3FE00000 # 1.750000
/* 02E38C 8002D78C 4620403E */ c.le.d $f8, $f0
/* 02E390 8002D790 00000000 */ nop
/* 02E394 8002D794 4502000B */ bc1fl .L8002D7C4_ovl0
/* 02E398 8002D798 44813800 */ mtc1 $at, $f7
/* 02E39C 8002D79C 3C013FE0 */ li $at, 0x3FE00000 # 1.750000
/* 02E3A0 8002D7A0 44818800 */ mtc1 $at, $f17
/* 02E3A4 8002D7A4 44808000 */ mtc1 $zero, $f16
/* 02E3A8 8002D7A8 00000000 */ nop
/* 02E3AC 8002D7AC 46300480 */ add.d $f18, $f0, $f16
/* 02E3B0 8002D7B0 4620910D */ trunc.w.d $f4, $f18
/* 02E3B4 8002D7B4 44022000 */ mfc1 $v0, $f4
/* 02E3B8 8002D7B8 10000009 */ b .L8002D7E0_ovl0
/* 02E3BC 8002D7BC 44828000 */ mtc1 $v0, $f16
/* 02E3C0 8002D7C0 44813800 */ mtc1 $at, $f7
.L8002D7C4_ovl0:
/* 02E3C4 8002D7C4 44803000 */ mtc1 $zero, $f6
/* 02E3C8 8002D7C8 00000000 */ nop
/* 02E3CC 8002D7CC 46260281 */ sub.d $f10, $f0, $f6
/* 02E3D0 8002D7D0 4620520D */ trunc.w.d $f8, $f10
/* 02E3D4 8002D7D4 44024000 */ mfc1 $v0, $f8
/* 02E3D8 8002D7D8 00000000 */ nop
/* 02E3DC 8002D7DC 44828000 */ mtc1 $v0, $f16
.L8002D7E0_ovl0:
/* 02E3E0 8002D7E0 3C018004 */ lui $at, %hi(D_80041CC0)
/* 02E3E4 8002D7E4 D4321AE0 */ ldc1 $f18, 0x1ae0($at)
/* 02E3E8 8002D7E8 46808021 */ cvt.d.w $f0, $f16
/* 02E3EC 8002D7EC 3C018004 */ lui $at, %hi(D_80041CC0)
/* 02E3F0 8002D7F0 D4261AE8 */ ldc1 $f6, 0x1ae8($at)
/* 02E3F4 8002D7F4 3C038004 */ lui $v1, %hi(D_80041AB0) # $v1, 0x8004
/* 02E3F8 8002D7F8 24631AB0 */ addiu $v1, %lo(D_80041AB0) # addiu $v1, $v1, 0x1ab0
/* 02E3FC 8002D7FC 46320102 */ mul.d $f4, $f0, $f18
/* 02E400 8002D800 D4680020 */ ldc1 $f8, 0x20($v1)
/* 02E404 8002D804 D4720018 */ ldc1 $f18, 0x18($v1)
/* 02E408 8002D808 30590001 */ andi $t9, $v0, 1
/* 02E40C 8002D80C 46260282 */ mul.d $f10, $f0, $f6
/* 02E410 8002D810 46241081 */ sub.d $f2, $f2, $f4
/* 02E414 8002D814 462A1081 */ sub.d $f2, $f2, $f10
/* 02E418 8002D818 D46A0010 */ ldc1 $f10, 0x10($v1)
/* 02E41C 8002D81C 46221302 */ mul.d $f12, $f2, $f2
/* 02E420 8002D820 00000000 */ nop
/* 02E424 8002D824 462C4402 */ mul.d $f16, $f8, $f12
/* 02E428 8002D828 46328100 */ add.d $f4, $f16, $f18
/* 02E42C 8002D82C D4720008 */ ldc1 $f18, 8($v1)
/* 02E430 8002D830 462C2182 */ mul.d $f6, $f4, $f12
/* 02E434 8002D834 462A3200 */ add.d $f8, $f6, $f10
/* 02E438 8002D838 462C4402 */ mul.d $f16, $f8, $f12
/* 02E43C 8002D83C 17200007 */ bnez $t9, .L8002D85C_ovl0
/* 02E440 8002D840 46309380 */ add.d $f14, $f18, $f16
/* 02E444 8002D844 462C1102 */ mul.d $f4, $f2, $f12
/* 02E448 8002D848 00000000 */ nop
/* 02E44C 8002D84C 462E2182 */ mul.d $f6, $f4, $f14
/* 02E450 8002D850 46223280 */ add.d $f10, $f6, $f2
/* 02E454 8002D854 03E00008 */ jr $ra
/* 02E458 8002D858 46205020 */ cvt.s.d $f0, $f10
.L8002D85C_ovl0:
/* 02E45C 8002D85C 462C1202 */ mul.d $f8, $f2, $f12
/* 02E460 8002D860 00000000 */ nop
/* 02E464 8002D864 462E4482 */ mul.d $f18, $f8, $f14
/* 02E468 8002D868 46229400 */ add.d $f16, $f18, $f2
/* 02E46C 8002D86C 46208020 */ cvt.s.d $f0, $f16
/* 02E470 8002D870 03E00008 */ jr $ra
/* 02E474 8002D874 46000007 */ neg.s $f0, $f0
.L8002D878_ovl0:
/* 02E478 8002D878 46042032 */ c.eq.s $f4, $f4
/* 02E47C 8002D87C 3C018004 */ lui $at, %hi(D_80041CC0)
/* 02E480 8002D880 45010004 */ bc1t .L8002D894_ovl0
/* 02E484 8002D884 00000000 */ nop
/* 02E488 8002D888 3C018004 */ lui $at, %hi(D_80041CC0)
/* 02E48C 8002D88C 03E00008 */ jr $ra
/* 02E490 8002D890 C4201CC0 */ lwc1 $f0, %lo(D_80041CC0)($at)
.L8002D894_ovl0:
/* 02E494 8002D894 C4201AF0 */ lwc1 $f0, 0x1af0($at)
/* 02E498 8002D898 03E00008 */ jr $ra
/* 02E49C 8002D89C 00000000 */ nop

View File

@ -2234,95 +2234,3 @@ u32 D_80041AA4 = 0x0A990A9A;
u32 D_80041AA8 = 0x0AA50AA6;
u32 D_80041AAC = 0x0AA90AAA;
u32 D_80041AB0 = 0x3FF00000;
u32 D_80041AB4 = 0x00000000;
u32 D_80041AB8 = 0xBFC55554;
u32 D_80041ABC = 0xBC83656D;
u32 D_80041AC0 = 0x3F8110ED;
u32 D_80041AC4 = 0x3804C2A0;
u32 D_80041AC8 = 0xBF29F6FF;
u32 D_80041ACC = 0xEEA56814;
u32 D_80041AD0 = 0x3EC5DBDF;
u32 D_80041AD4 = 0x0E314BFE;
u32 D_80041AD8 = 0x3FD45F30;
u32 D_80041ADC = 0x6DC9C883;
u32 D_80041AE0 = 0x400921FB;
u32 D_80041AE4 = 0x50000000;
u32 D_80041AE8 = 0x3E6110B4;
u32 D_80041AEC = 0x611A6263;
u32 D_80041AF0 = 0x00000000;
u32 D_80041AF4 = 0x00000000;
u32 D_80041AF8 = 0x00000000;
u32 D_80041AFC = 0x00000000;
u32 __osIntOffTable = 0x00141818;
u32 D_80041B04 = 0x1C1C1C1C;
u32 D_80041B08 = 0x20202020;
u32 D_80041B0C = 0x20202020;
u32 D_80041B10 = 0x00040808;
u32 D_80041B14 = 0x0C0C0C0C;
u32 D_80041B18 = 0x10101010;
u32 D_80041B1C = 0x10101010;
u32 __osIntTable = 0x8002E428;
u32 D_80041B24 = 0x8002E3F0;
u32 D_80041B28 = 0x8002E3D0;
u32 D_80041B2C = 0x8002E234;
u32 D_80041B30 = 0x8002E1E0;
u32 D_80041B34 = 0x8002E374;
u32 D_80041B38 = 0x8002E1A8;
u32 D_80041B3C = 0x8002E1B4;
u32 D_80041B40 = 0x8002E1C0;
u32 D_80041B44 = 0x00000000;
u32 D_80041B48 = 0x00000000;
u32 D_80041B4C = 0x00000000;
// u32 D_80041B50 = 0x8003293C;
// u32 D_80041B54 = 0x80032834;
// u32 D_80041B58 = 0x80032870;
// u32 D_80041B5C = 0x8003295C;
// u32 D_80041B60 = 0x8003295C;
// u32 D_80041B64 = 0x800328AC;
// u32 D_80041B68 = 0x800328F4;
// u32 D_80041B6C = 0x00000000;

53
data/kirby.039DF0.2.05.c Normal file
View File

@ -0,0 +1,53 @@
#include <PR/ultratypes.h>
u32 __osIntOffTable = 0x00141818;
u32 D_80041B04 = 0x1C1C1C1C;
u32 D_80041B08 = 0x20202020;
u32 D_80041B0C = 0x20202020;
u32 D_80041B10 = 0x00040808;
u32 D_80041B14 = 0x0C0C0C0C;
u32 D_80041B18 = 0x10101010;
u32 D_80041B1C = 0x10101010;
u32 __osIntTable = 0x8002E428;
u32 D_80041B24 = 0x8002E3F0;
u32 D_80041B28 = 0x8002E3D0;
u32 D_80041B2C = 0x8002E234;
u32 D_80041B30 = 0x8002E1E0;
u32 D_80041B34 = 0x8002E374;
u32 D_80041B38 = 0x8002E1A8;
u32 D_80041B3C = 0x8002E1B4;
u32 D_80041B40 = 0x8002E1C0;
u32 D_80041B44 = 0x00000000;
u32 D_80041B48 = 0x00000000;
u32 D_80041B4C = 0x00000000;
// u32 D_80041B50 = 0x8003293C;
// u32 D_80041B54 = 0x80032834;
// u32 D_80041B58 = 0x80032870;
// u32 D_80041B5C = 0x8003295C;
// u32 D_80041B60 = 0x8003295C;
// u32 D_80041B64 = 0x800328AC;
// u32 D_80041B68 = 0x800328F4;
// u32 D_80041B6C = 0x00000000;

View File

@ -69,6 +69,10 @@ SECTIONS
BUILD_DIR/src/ovl0/ovl0_8.o(.text);
BUILD_DIR/asm/ovl0/ovl0_9.o(.text);
BUILD_DIR/libultra.a:sinf.o(.text);
BUILD_DIR/libultra.a:sptask.o(.text);
BUILD_DIR/libultra.a:destroythread.o(.text);
BUILD_DIR/libultra.a:ll.o(.text);
@ -245,6 +249,8 @@ SECTIONS
BUILD_DIR/src/ovl0/ovl0_2_5.o(.rodata);
BUILD_DIR/src/ovl0/ovl0_2_5_1.o(.rodata);
BUILD_DIR/data/kirby.039DF0.2.01.o(.data);
BUILD_DIR/libultra.a:sinf.o(.rodata);
BUILD_DIR/data/kirby.039DF0.2.05.o(.data);
BUILD_DIR/libultra.a:devmgr.o(.rodata);
BUILD_DIR/data/kirby.039DF0.2.1.o(.data);
BUILD_DIR/libultra.a:cosf.o(.rodata);