falso
/
mk64
mirror of https://github.com/n64decomp/mk64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match 2 functions and refresh a couple m2c outputs (#208) 

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran 2022-05-24 05:55:00 -04:00 committed by GitHub
parent 84cb46c0e5
commit 45f6233b95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 332 additions and 765 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
asm/non_matchings/code_actors/func_80298C94.s
View File

@ -1,34 +0,0 @@
glabel func_80298C94
/* 1022A4 80298C94 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 1022A8 80298C98 AFB20020 */ sw $s2, 0x20($sp)
/* 1022AC 80298C9C AFB00018 */ sw $s0, 0x18($sp)
/* 1022B0 80298CA0 AFB1001C */ sw $s1, 0x1c($sp)
/* 1022B4 80298CA4 3C10800F */ lui $s0, %hi(gPlayers) # $s0, 0x800f
/* 1022B8 80298CA8 3C128010 */ lui $s2, %hi(gPlayers+0x3760) # $s2, 0x8010
/* 1022BC 80298CAC AFBF0024 */ sw $ra, 0x24($sp)
/* 1022C0 80298CB0 2652A0F0 */ addiu $s2, %lo(gPlayers+0x3760) # addiu $s2, $s2, -0x5f10
/* 1022C4 80298CB4 26106990 */ addiu $s0, %lo(gPlayers) # addiu $s0, $s0, 0x6990
/* 1022C8 80298CB8 24110008 */ li $s1, 8
/* 1022CC 80298CBC 960E0000 */ lhu $t6, ($s0)
.L80298CC0:
/* 1022D0 80298CC0 31CFC000 */ andi $t7, $t6, 0xc000
/* 1022D4 80298CC4 51E0000A */ beql $t7, $zero, .L80298CF0
/* 1022D8 80298CC8 26100DD8 */ addiu $s0, $s0, 0xdd8
/* 1022DC 80298CCC 0C0AAF44 */ jal func_802ABD10
/* 1022E0 80298CD0 9604011A */ lhu $a0, 0x11a($s0)
/* 1022E4 80298CD4 0002C600 */ sll $t8, $v0, 0x18
/* 1022E8 80298CD8 0018CE03 */ sra $t9, $t8, 0x18
/* 1022EC 80298CDC 56390004 */ bnel $s1, $t9, .L80298CF0
/* 1022F0 80298CE0 26100DD8 */ addiu $s0, $s0, 0xdd8
/* 1022F4 80298CE4 0C0A62B0 */ jal func_80298AC0
/* 1022F8 80298CE8 02002025 */ move $a0, $s0
/* 1022FC 80298CEC 26100DD8 */ addiu $s0, $s0, 0xdd8
.L80298CF0:
/* 102300 80298CF0 5612FFF3 */ bnel $s0, $s2, .L80298CC0
/* 102304 80298CF4 960E0000 */ lhu $t6, ($s0)
/* 102308 80298CF8 8FBF0024 */ lw $ra, 0x24($sp)
/* 10230C 80298CFC 8FB00018 */ lw $s0, 0x18($sp)
/* 102310 80298D00 8FB1001C */ lw $s1, 0x1c($sp)
/* 102314 80298D04 8FB20020 */ lw $s2, 0x20($sp)
/* 102318 80298D08 03E00008 */ jr $ra
/* 10231C 80298D0C 27BD0028 */ addiu $sp, $sp, 0x28

177
asm/non_matchings/code_actors/func_8029F408.s
View File

@ -1,177 +0,0 @@
glabel func_8029F408
/* 108A18 8029F408 27BDFFC8 */ addiu $sp, $sp, -0x38
/* 108A1C 8029F40C AFBF0014 */ sw $ra, 0x14($sp)
/* 108A20 8029F410 C4860014 */ lwc1 $f6, 0x14($a0)
/* 108A24 8029F414 C4A40018 */ lwc1 $f4, 0x18($a1)
/* 108A28 8029F418 44808000 */ mtc1 $zero, $f16
/* 108A2C 8029F41C 00803825 */ move $a3, $a0
/* 108A30 8029F420 46062081 */ sub.s $f2, $f4, $f6
/* 108A34 8029F424 3C014270 */ lui $at, 0x4270
/* 108A38 8029F428 4610103C */ c.lt.s $f2, $f16
/* 108A3C 8029F42C 00000000 */ nop
/* 108A40 8029F430 4502000B */ bc1fl .L8029F460
/* 108A44 8029F434 3C014270 */ li $at, 0x42700000 # 60.000000
/* 108A48 8029F438 44817000 */ mtc1 $at, $f14
/* 108A4C 8029F43C 00000000 */ nop
/* 108A50 8029F440 46007207 */ neg.s $f8, $f14
/* 108A54 8029F444 4608103C */ c.lt.s $f2, $f8
/* 108A58 8029F448 00000000 */ nop
/* 108A5C 8029F44C 45020004 */ bc1fl .L8029F460
/* 108A60 8029F450 3C014270 */ lui $at, 0x4270
/* 108A64 8029F454 1000008D */ b .L8029F68C
/* 108A68 8029F458 00001025 */ move $v0, $zero
/* 108A6C 8029F45C 3C014270 */ li $at, 0x42700000 # 60.000000
.L8029F460:
/* 108A70 8029F460 44817000 */ mtc1 $at, $f14
/* 108A74 8029F464 00000000 */ nop
/* 108A78 8029F468 4602703C */ c.lt.s $f14, $f2
/* 108A7C 8029F46C 00000000 */ nop
/* 108A80 8029F470 45020004 */ bc1fl .L8029F484
/* 108A84 8029F474 C4AA0020 */ lwc1 $f10, 0x20($a1)
/* 108A88 8029F478 10000084 */ b .L8029F68C
/* 108A8C 8029F47C 00001025 */ move $v0, $zero
/* 108A90 8029F480 C4AA0020 */ lwc1 $f10, 0x20($a1)
.L8029F484:
/* 108A94 8029F484 C4F2001C */ lwc1 $f18, 0x1c($a3)
/* 108A98 8029F488 46125001 */ sub.s $f0, $f10, $f18
/* 108A9C 8029F48C 4610003C */ c.lt.s $f0, $f16
/* 108AA0 8029F490 00000000 */ nop
/* 108AA4 8029F494 45020009 */ bc1fl .L8029F4BC
/* 108AA8 8029F498 4600703C */ c.lt.s $f14, $f0
/* 108AAC 8029F49C 46007107 */ neg.s $f4, $f14
/* 108AB0 8029F4A0 4604003C */ c.lt.s $f0, $f4
/* 108AB4 8029F4A4 00000000 */ nop
/* 108AB8 8029F4A8 45020004 */ bc1fl .L8029F4BC
/* 108ABC 8029F4AC 4600703C */ c.lt.s $f14, $f0
/* 108AC0 8029F4B0 10000076 */ b .L8029F68C
/* 108AC4 8029F4B4 00001025 */ move $v0, $zero
/* 108AC8 8029F4B8 4600703C */ c.lt.s $f14, $f0
.L8029F4BC:
/* 108ACC 8029F4BC 00000000 */ nop
/* 108AD0 8029F4C0 45000003 */ bc1f .L8029F4D0
/* 108AD4 8029F4C4 00000000 */ nop
/* 108AD8 8029F4C8 10000070 */ b .L8029F68C
/* 108ADC 8029F4CC 00001025 */ move $v0, $zero
.L8029F4D0:
/* 108AE0 8029F4D0 46021182 */ mul.s $f6, $f2, $f2
/* 108AE4 8029F4D4 AFA5003C */ sw $a1, 0x3c($sp)
/* 108AE8 8029F4D8 AFA70038 */ sw $a3, 0x38($sp)
/* 108AEC 8029F4DC 46000202 */ mul.s $f8, $f0, $f0
/* 108AF0 8029F4E0 0C033850 */ jal sqrtf
/* 108AF4 8029F4E4 46083300 */ add.s $f12, $f6, $f8
/* 108AF8 8029F4E8 3C014270 */ li $at, 0x42700000 # 60.000000
/* 108AFC 8029F4EC 44817000 */ mtc1 $at, $f14
/* 108B00 8029F4F0 8FA70038 */ lw $a3, 0x38($sp)
/* 108B04 8029F4F4 46000086 */ mov.s $f2, $f0
/* 108B08 8029F4F8 4600703C */ c.lt.s $f14, $f0
/* 108B0C 8029F4FC 00E02025 */ move $a0, $a3
/* 108B10 8029F500 45020004 */ bc1fl .L8029F514
/* 108B14 8029F504 AFA70038 */ sw $a3, 0x38($sp)
/* 108B18 8029F508 10000060 */ b .L8029F68C
/* 108B1C 8029F50C 00001025 */ move $v0, $zero
/* 108B20 8029F510 AFA70038 */ sw $a3, 0x38($sp)
.L8029F514:
/* 108B24 8029F514 0C0A5DEC */ jal func_802977B0
/* 108B28 8029F518 E7A2001C */ swc1 $f2, 0x1c($sp)
/* 108B2C 8029F51C 8FA2003C */ lw $v0, 0x3c($sp)
/* 108B30 8029F520 8FA70038 */ lw $a3, 0x38($sp)
/* 108B34 8029F524 44802000 */ mtc1 $zero, $f4
/* 108B38 8029F528 C452001C */ lwc1 $f18, 0x1c($v0)
/* 108B3C 8029F52C C4EA0018 */ lwc1 $f10, 0x18($a3)
/* 108B40 8029F530 C7A2001C */ lwc1 $f2, 0x1c($sp)
/* 108B44 8029F534 46125001 */ sub.s $f0, $f10, $f18
/* 108B48 8029F538 4604003C */ c.lt.s $f0, $f4
/* 108B4C 8029F53C 00000000 */ nop
/* 108B50 8029F540 45020004 */ bc1fl .L8029F554
/* 108B54 8029F544 C4E60070 */ lwc1 $f6, 0x70($a3)
/* 108B58 8029F548 10000050 */ b .L8029F68C
/* 108B5C 8029F54C 00001025 */ move $v0, $zero
/* 108B60 8029F550 C4E60070 */ lwc1 $f6, 0x70($a3)
.L8029F554:
/* 108B64 8029F554 C448000C */ lwc1 $f8, 0xc($v0)
/* 108B68 8029F558 46083000 */ add.s $f0, $f6, $f8
/* 108B6C 8029F55C 4602003C */ c.lt.s $f0, $f2
/* 108B70 8029F560 00000000 */ nop
/* 108B74 8029F564 45020004 */ bc1fl .L8029F578
/* 108B78 8029F568 94EE0000 */ lhu $t6, ($a3)
/* 108B7C 8029F56C 10000047 */ b .L8029F68C
/* 108B80 8029F570 00001025 */ move $v0, $zero
/* 108B84 8029F574 94EE0000 */ lhu $t6, ($a3)
.L8029F578:
/* 108B88 8029F578 3C0B800E */ lui $t3, %hi(gPlayerOne) # $t3, 0x800e
/* 108B8C 8029F57C 31CF4000 */ andi $t7, $t6, 0x4000
/* 108B90 8029F580 11E00038 */ beqz $t7, .L8029F664
/* 108B94 8029F584 00000000 */ nop
/* 108B98 8029F588 8CF800BC */ lw $t8, 0xbc($a3)
/* 108B9C 8029F58C 3C014100 */ li $at, 0x41000000 # 8.000000
/* 108BA0 8029F590 00E02025 */ move $a0, $a3
/* 108BA4 8029F594 33190200 */ andi $t9, $t8, 0x200
/* 108BA8 8029F598 1320001C */ beqz $t9, .L8029F60C
/* 108BAC 8029F59C 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e
/* 108BB0 8029F5A0 84480002 */ lh $t0, 2($v0)
/* 108BB4 8029F5A4 44815000 */ mtc1 $at, $f10
/* 108BB8 8029F5A8 3C061901 */ lui $a2, (0x19018010 >> 16) # lui $a2, 0x1901
/* 108BBC 8029F5AC 35090400 */ ori $t1, $t0, 0x400
/* 108BC0 8029F5B0 A4490002 */ sh $t1, 2($v0)
/* 108BC4 8029F5B4 E44A0028 */ swc1 $f10, 0x28($v0)
/* 108BC8 8029F5B8 AFA70038 */ sw $a3, 0x38($sp)
/* 108BCC 8029F5BC 34C68010 */ ori $a2, (0x19018010 & 0xFFFF) # ori $a2, $a2, 0x8010
/* 108BD0 8029F5C0 24E40014 */ addiu $a0, $a3, 0x14
/* 108BD4 8029F5C4 0C03262E */ jal func_800C98B8
/* 108BD8 8029F5C8 24E50034 */ addiu $a1, $a3, 0x34
/* 108BDC 8029F5CC 3C0A800E */ lui $t2, %hi(gPlayerOne) # $t2, 0x800e
/* 108BE0 8029F5D0 8FA70038 */ lw $a3, 0x38($sp)
/* 108BE4 8029F5D4 8D4AC4DC */ lw $t2, %lo(gPlayerOne)($t2)
/* 108BE8 8029F5D8 24010DD8 */ li $at, 3544
/* 108BEC 8029F5DC 94E50254 */ lhu $a1, 0x254($a3)
/* 108BF0 8029F5E0 00EA2023 */ subu $a0, $a3, $t2
/* 108BF4 8029F5E4 0081001A */ div $zero, $a0, $at
/* 108BF8 8029F5E8 3C012900 */ lui $at, (0x2900800D >> 16) # lui $at, 0x2900
/* 108BFC 8029F5EC 3421800D */ ori $at, (0x2900800D & 0xFFFF) # ori $at, $at, 0x800d
/* 108C00 8029F5F0 00005812 */ mflo $t3
/* 108C04 8029F5F4 00056900 */ sll $t5, $a1, 4
/* 108C08 8029F5F8 01A12821 */ addu $a1, $t5, $at
/* 108C0C 8029F5FC 0C03243D */ jal func_800C90F4
/* 108C10 8029F600 316400FF */ andi $a0, $t3, 0xff
/* 108C14 8029F604 10000021 */ b .L8029F68C
/* 108C18 8029F608 24020001 */ li $v0, 1
.L8029F60C:
/* 108C1C 8029F60C 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6)
/* 108C20 8029F610 24010DD8 */ li $at, 3544
/* 108C24 8029F614 AFA70038 */ sw $a3, 0x38($sp)
/* 108C28 8029F618 00EE2823 */ subu $a1, $a3, $t6
/* 108C2C 8029F61C 00A1001A */ div $zero, $a1, $at
/* 108C30 8029F620 00007812 */ mflo $t7
/* 108C34 8029F624 000FC600 */ sll $t8, $t7, 0x18
/* 108C38 8029F628 0C0236AF */ jal func_8008DABC
/* 108C3C 8029F62C 00182E03 */ sra $a1, $t8, 0x18
/* 108C40 8029F630 3C08800E */ lui $t0, %hi(gModeSelection) # $t0, 0x800e
/* 108C44 8029F634 8D08C53C */ lw $t0, %lo(gModeSelection)($t0)
/* 108C48 8029F638 24020001 */ li $v0, 1
/* 108C4C 8029F63C 8FA70038 */ lw $a3, 0x38($sp)
/* 108C50 8029F640 54480012 */ bnel $v0, $t0, .L8029F68C
/* 108C54 8029F644 24020001 */ li $v0, 1
/* 108C58 8029F648 94E90000 */ lhu $t1, ($a3)
/* 108C5C 8029F64C 3C018016 */ lui $at, %hi(D_80162DF8) # $at, 0x8016
/* 108C60 8029F650 312A1000 */ andi $t2, $t1, 0x1000
/* 108C64 8029F654 5540000D */ bnel $t2, $zero, .L8029F68C
/* 108C68 8029F658 24020001 */ li $v0, 1
/* 108C6C 8029F65C 1000000A */ b .L8029F688
/* 108C70 8029F660 AC222DF8 */ sw $v0, %lo(D_80162DF8)($at)
.L8029F664:
/* 108C74 8029F664 8D6BC4DC */ lw $t3, %lo(gPlayerOne)($t3)
/* 108C78 8029F668 24010DD8 */ li $at, 3544
/* 108C7C 8029F66C 00E02025 */ move $a0, $a3
/* 108C80 8029F670 00EB2823 */ subu $a1, $a3, $t3
/* 108C84 8029F674 00A1001A */ div $zero, $a1, $at
/* 108C88 8029F678 00006012 */ mflo $t4
/* 108C8C 8029F67C 000C6E00 */ sll $t5, $t4, 0x18
/* 108C90 8029F680 0C0236AF */ jal func_8008DABC
/* 108C94 8029F684 000D2E03 */ sra $a1, $t5, 0x18
.L8029F688:
/* 108C98 8029F688 24020001 */ li $v0, 1
.L8029F68C:
/* 108C9C 8029F68C 8FBF0014 */ lw $ra, 0x14($sp)
/* 108CA0 8029F690 27BD0038 */ addiu $sp, $sp, 0x38
/* 108CA4 8029F694 03E00008 */ jr $ra
/* 108CA8 8029F698 00000000 */ nop

2
src/code_8008C1D0.h
View File

@ -81,7 +81,7 @@ void func_80056A94(s32, Player*);
// code_80057C60
void func_8006B8B4(Player*, s8);
// audio/external.c
void func_800C90F4(u8, s32);
void func_800C90F4(u8, uintptr_t);
void func_800C9060(u8, s32);
void func_800C9250(u8);
void func_800CA24C(u8);

879
src/code_80296A50.c
View File

File diff suppressed because it is too large Load Diff

5
src/code_80296A50.h
View File

@ -29,6 +29,7 @@ void update_obj_train_car2(struct TrainCar*);
void update_obj_piranha_plant(struct PiranhaPlant*);
void func_80298328(Camera*, Mat4, struct PiranhaPlant*);
void func_802986B4(Camera*, Mat4, struct Actor*);
void func_80298AC0(Player*);
void func_80298D7C(Camera*, Mat4, struct Actor*);
void func_80299144(Camera*, Mat4, struct Actor*);
void func_8029930C(Camera*, Mat4, struct Actor*);
@ -73,6 +74,7 @@ void destroy_actor(struct Actor*);
s16 func_8029E890(f32 *, s16 *, f32 *, s16);
s16 func_8029EC88(Vec3f, Vec3s, Vec3f, s16);
s32 func_8029EEB8(Player*, Vec3f, f32, f32, f32);
s32 func_8029F408(Player*, struct YoshiValleyEgg*);
s32 func_8029FB80(Player*, struct Actor*);
s32 func_8029FCA4(struct Actor*, struct Actor*);
void func_8029FDC8(struct Actor*);
@ -100,7 +102,7 @@ void update_simple_objects();
// audio/external.c
extern void func_800C98B8(Vec3f, Vec3f, u32);
extern void func_800C9060(Player*, s32);
extern void func_800C90F4(Player*, s32);
extern void func_800C90F4(u8, uintptr_t);
extern void func_800C99E0(Vec3f, s32);
extern void func_800C9D80(Vec3f*, Vec3f*, u32);
@ -266,6 +268,7 @@ extern s32 D_8015F8E0;
extern s32 D_801625EC;
extern s32 D_801625F0;
extern s32 D_801625F4;
extern s32 D_80162DF8;
extern s32 D_802BA058;
extern s8 D_06006990[];