Game-Decompilation/kirby64
1
0
Fork 0
mirror of https://github.com/farisawan-2000/kirby64.git synced 2024-11-27 07:00:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

yakulib work

Browse Source
This commit is contained in:
farisawan-2000 2020-10-30 22:06:36 -04:00
parent 42cd40d511
commit 76dd7b9604
28 changed files with 147 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/non_matchings/ovl2_5/func_800FE154_ovl2.s
View File

@ -42,7 +42,7 @@ glabel func_800FE154_ovl2
/* 086C64 800FE1F4 3C078013 */ lui $a3, %hi(D_8012B9A0) # $a3, 0x8013
/* 086C68 800FE1F8 24E7B9A0 */ addiu $a3, %lo(D_8012B9A0) # addiu $a3, $a3, -0x4660
/* 086C6C 800FE1FC 8FA50168 */ lw $a1, 0x168($sp)
/* 086C70 800FE200 0C040648 */ jal func_80101920_ovl2
/* 086C70 800FE200 0C040648 */ jal func_80101920
/* 086C74 800FE204 00003025 */ move $a2, $zero
/* 086C78 800FE208 50400315 */ beql $v0, $zero, .L800FEE60_ovl2
/* 086C7C 800FE20C 8FBF002C */ lw $ra, 0x2c($sp)
@ -129,7 +129,7 @@ glabel func_800FE154_ovl2
/* 086DB4 800FE344 24E7B9A0 */ addiu $a3, %lo(D_8012B9A0) # addiu $a3, $a3, -0x4660
/* 086DB8 800FE348 8FA40134 */ lw $a0, 0x134($sp)
/* 086DBC 800FE34C 8FA5013C */ lw $a1, 0x13c($sp)
/* 086DC0 800FE350 0C040648 */ jal func_80101920_ovl2
/* 086DC0 800FE350 0C040648 */ jal func_80101920
/* 086DC4 800FE354 00003025 */ move $a2, $zero
/* 086DC8 800FE358 104002C0 */ beqz $v0, .L800FEE5C_ovl2
.L800FE35C_ovl2:
@ -150,7 +150,7 @@ glabel func_800FE154_ovl2
/* 086E04 800FE394 8FA40130 */ lw $a0, 0x130($sp)
/* 086E08 800FE398 8FA50138 */ lw $a1, 0x138($sp)
/* 086E0C 800FE39C 00003025 */ move $a2, $zero
/* 086E10 800FE3A0 0C040648 */ jal func_80101920_ovl2
/* 086E10 800FE3A0 0C040648 */ jal func_80101920
/* 086E14 800FE3A4 AFA20128 */ sw $v0, 0x128($sp)
/* 086E18 800FE3A8 104002AC */ beqz $v0, .L800FEE5C_ovl2
/* 086E1C 800FE3AC 8FA30128 */ lw $v1, 0x128($sp)
@ -493,7 +493,7 @@ glabel func_800FE154_ovl2
/* 087324 800FE8B4 3C078013 */ lui $a3, %hi(D_8012B9A0) # $a3, 0x8013
/* 087328 800FE8B8 24E7B9A0 */ addiu $a3, %lo(D_8012B9A0) # addiu $a3, $a3, -0x4660
/* 08732C 800FE8BC 8FA500A4 */ lw $a1, 0xa4($sp)
/* 087330 800FE8C0 0C040648 */ jal func_80101920_ovl2
/* 087330 800FE8C0 0C040648 */ jal func_80101920
/* 087334 800FE8C4 00003025 */ move $a2, $zero
/* 087338 800FE8C8 10400164 */ beqz $v0, .L800FEE5C_ovl2
/* 08733C 800FE8CC 8FB800A4 */ lw $t8, 0xa4($sp)

2
asm/non_matchings/ovl2_6/func_80101E14_ovl2.s
View File

@ -11,7 +11,7 @@ glabel func_80101E14_ovl2
/* 08A8A8 80101E38 C4B00008 */ lwc1 $f16, 8($a1)
/* 08A8AC 80101E3C 27A50018 */ addiu $a1, $sp, 0x18
/* 08A8B0 80101E40 46008487 */ neg.s $f18, $f16
/* 08A8B4 80101E44 0C040648 */ jal func_80101920_ovl2
/* 08A8B4 80101E44 0C040648 */ jal func_80101920
/* 08A8B8 80101E48 E7B20020 */ swc1 $f18, 0x20($sp)
/* 08A8BC 80101E4C 8FBF0014 */ lw $ra, 0x14($sp)
/* 08A8C0 80101E50 27BD0028 */ addiu $sp, $sp, 0x28

2
asm/non_matchings/ovl2_6/func_80102364_ovl2.s
View File

@ -1,4 +1,4 @@
glabel func_80102364_ovl2
glabel func_80102364
/* 08ADD4 80102364 44806000 */ mtc1 $zero, $f12
/* 08ADD8 80102368 C4800004 */ lwc1 $f0, 4($a0)
/* 08ADDC 8010236C 3C013F00 */ li $at, 0x3F000000 # 0.500000

4
asm/non_matchings/ovl2_6/func_80104010_ovl2.s
View File

@ -13,8 +13,8 @@ glabel func_80104010_ovl2
/* 08CAAC 8010403C 27A90034 */ addiu $t1, $sp, 0x34
/* 08CAB0 80104040 ADE80000 */ sw $t0, ($t7)
/* 08CAB4 80104044 8C990004 */ lw $t9, 4($a0)
/* 08CAB8 80104048 3C0E8010 */ lui $t6, %hi(D_80102364) # $t6, 0x8010
/* 08CABC 8010404C 25CE2364 */ addiu $t6, %lo(D_80102364) # addiu $t6, $t6, 0x2364
/* 08CAB8 80104048 3C0E8010 */ lui $t6, %hi(func_80102364) # $t6, 0x8010
/* 08CABC 8010404C 25CE2364 */ addiu $t6, %lo(func_80102364) # addiu $t6, $t6, 0x2364
/* 08CAC0 80104050 ADF90004 */ sw $t9, 4($t7)
/* 08CAC4 80104054 8C880008 */ lw $t0, 8($a0)
/* 08CAC8 80104058 ADE80008 */ sw $t0, 8($t7)

4
asm/non_matchings/ovl2_6/func_801040CC_ovl2.s
View File

@ -13,11 +13,11 @@ glabel func_801040CC_ovl2
/* 08CB68 801040F8 27A90034 */ addiu $t1, $sp, 0x34
/* 08CB6C 801040FC ADE80000 */ sw $t0, ($t7)
/* 08CB70 80104100 8C990004 */ lw $t9, 4($a0)
/* 08CB74 80104104 3C0D8010 */ lui $t5, %hi(D_80102364) # $t5, 0x8010
/* 08CB74 80104104 3C0D8010 */ lui $t5, %hi(func_80102364) # $t5, 0x8010
/* 08CB78 80104108 3C0E8010 */ lui $t6, %hi(func_80101D50) # $t6, 0x8010
/* 08CB7C 8010410C ADF90004 */ sw $t9, 4($t7)
/* 08CB80 80104110 8C880008 */ lw $t0, 8($a0)
/* 08CB84 80104114 25AD2364 */ addiu $t5, %lo(D_80102364) # addiu $t5, $t5, 0x2364
/* 08CB84 80104114 25AD2364 */ addiu $t5, %lo(func_80102364) # addiu $t5, $t5, 0x2364
/* 08CB88 80104118 25CE1D50 */ addiu $t6, %lo(func_80101D50) # addiu $t6, $t6, 0x1d50
/* 08CB8C 8010411C ADE80008 */ sw $t0, 8($t7)
/* 08CB90 80104120 8FAA0074 */ lw $t2, 0x74($sp)

8
asm/non_matchings/ovl2_6/func_80104184_ovl2.s
View File

@ -13,12 +13,12 @@ glabel func_80104184_ovl2
/* 08CC20 801041B0 27A90034 */ addiu $t1, $sp, 0x34
/* 08CC24 801041B4 ADE80000 */ sw $t0, ($t7)
/* 08CC28 801041B8 8C990004 */ lw $t9, 4($a0)
/* 08CC2C 801041BC 3C0D8010 */ lui $t5, %hi(D_80102364) # $t5, 0x8010
/* 08CC30 801041C0 3C0E8010 */ lui $t6, %hi(D_80101E14) # $t6, 0x8010
/* 08CC2C 801041BC 3C0D8010 */ lui $t5, %hi(func_80102364) # $t5, 0x8010
/* 08CC30 801041C0 3C0E8010 */ lui $t6, %hi(func_80101E14) # $t6, 0x8010
/* 08CC34 801041C4 ADF90004 */ sw $t9, 4($t7)
/* 08CC38 801041C8 8C880008 */ lw $t0, 8($a0)
/* 08CC3C 801041CC 25AD2364 */ addiu $t5, %lo(D_80102364) # addiu $t5, $t5, 0x2364
/* 08CC40 801041D0 25CE1E14 */ addiu $t6, %lo(D_80101E14) # addiu $t6, $t6, 0x1e14
/* 08CC3C 801041CC 25AD2364 */ addiu $t5, %lo(func_80102364) # addiu $t5, $t5, 0x2364
/* 08CC40 801041D0 25CE1E14 */ addiu $t6, %lo(func_80101E14) # addiu $t6, $t6, 0x1e14
/* 08CC44 801041D4 ADE80008 */ sw $t0, 8($t7)
/* 08CC48 801041D8 8FAA0074 */ lw $t2, 0x74($sp)
/* 08CC4C 801041DC 8D4C0000 */ lw $t4, ($t2)

4
asm/non_matchings/ovl2_6/func_8010423C_ovl2.s
View File

@ -13,8 +13,8 @@ glabel func_8010423C_ovl2
/* 08CCD8 80104268 27A90034 */ addiu $t1, $sp, 0x34
/* 08CCDC 8010426C ADE80000 */ sw $t0, ($t7)
/* 08CCE0 80104270 8C990004 */ lw $t9, 4($a0)
/* 08CCE4 80104274 3C0E8010 */ lui $t6, %hi(D_801023FC) # $t6, 0x8010
/* 08CCE8 80104278 25CE23FC */ addiu $t6, %lo(D_801023FC) # addiu $t6, $t6, 0x23fc
/* 08CCE4 80104274 3C0E8010 */ lui $t6, %hi(func_801023FC) # $t6, 0x8010
/* 08CCE8 80104278 25CE23FC */ addiu $t6, %lo(func_801023FC) # addiu $t6, $t6, 0x23fc
/* 08CCEC 8010427C ADF90004 */ sw $t9, 4($t7)
/* 08CCF0 80104280 8C880008 */ lw $t0, 8($a0)
/* 08CCF4 80104284 ADE80008 */ sw $t0, 8($t7)

4
asm/non_matchings/ovl2_6/func_801042F4_ovl2.s
View File

@ -13,8 +13,8 @@ glabel func_801042F4_ovl2
/* 08CD90 80104320 27A90034 */ addiu $t1, $sp, 0x34
/* 08CD94 80104324 ADE80000 */ sw $t0, ($t7)
/* 08CD98 80104328 8C990004 */ lw $t9, 4($a0)
/* 08CD9C 8010432C 3C0E8010 */ lui $t6, %hi(D_801023FC) # $t6, 0x8010
/* 08CDA0 80104330 25CE23FC */ addiu $t6, %lo(D_801023FC) # addiu $t6, $t6, 0x23fc
/* 08CD9C 8010432C 3C0E8010 */ lui $t6, %hi(func_801023FC) # $t6, 0x8010
/* 08CDA0 80104330 25CE23FC */ addiu $t6, %lo(func_801023FC) # addiu $t6, $t6, 0x23fc
/* 08CDA4 80104334 ADF90004 */ sw $t9, 4($t7)
/* 08CDA8 80104338 8C880008 */ lw $t0, 8($a0)
/* 08CDAC 8010433C ADE80008 */ sw $t0, 8($t7)

8
asm/non_matchings/ovl2_6/func_801043B0_ovl2.s
View File

@ -13,12 +13,12 @@ glabel func_801043B0_ovl2
/* 08CE4C 801043DC 27A90034 */ addiu $t1, $sp, 0x34
/* 08CE50 801043E0 ADE80000 */ sw $t0, ($t7)
/* 08CE54 801043E4 8C990004 */ lw $t9, 4($a0)
/* 08CE58 801043E8 3C0D8010 */ lui $t5, %hi(D_801023FC) # $t5, 0x8010
/* 08CE5C 801043EC 3C0E8010 */ lui $t6, %hi(D_80101E14) # $t6, 0x8010
/* 08CE58 801043E8 3C0D8010 */ lui $t5, %hi(func_801023FC) # $t5, 0x8010
/* 08CE5C 801043EC 3C0E8010 */ lui $t6, %hi(func_80101E14) # $t6, 0x8010
/* 08CE60 801043F0 ADF90004 */ sw $t9, 4($t7)
/* 08CE64 801043F4 8C880008 */ lw $t0, 8($a0)
/* 08CE68 801043F8 25AD23FC */ addiu $t5, %lo(D_801023FC) # addiu $t5, $t5, 0x23fc
/* 08CE6C 801043FC 25CE1E14 */ addiu $t6, %lo(D_80101E14) # addiu $t6, $t6, 0x1e14
/* 08CE68 801043F8 25AD23FC */ addiu $t5, %lo(func_801023FC) # addiu $t5, $t5, 0x23fc
/* 08CE6C 801043FC 25CE1E14 */ addiu $t6, %lo(func_80101E14) # addiu $t6, $t6, 0x1e14
/* 08CE70 80104400 ADE80008 */ sw $t0, 8($t7)
/* 08CE74 80104404 8FAA0074 */ lw $t2, 0x74($sp)
/* 08CE78 80104408 8D4C0000 */ lw $t4, ($t2)

8
asm/non_matchings/ovl2_6/func_80104468_ovl2.s
View File

@ -13,12 +13,12 @@ glabel func_80104468_ovl2
/* 08CF04 80104494 27A90034 */ addiu $t1, $sp, 0x34
/* 08CF08 80104498 ADE80000 */ sw $t0, ($t7)
/* 08CF0C 8010449C 8C990004 */ lw $t9, 4($a0)
/* 08CF10 801044A0 3C0D8010 */ lui $t5, %hi(D_801023FC) # $t5, 0x8010
/* 08CF14 801044A4 3C0E8010 */ lui $t6, %hi(D_80101DA8) # $t6, 0x8010
/* 08CF10 801044A0 3C0D8010 */ lui $t5, %hi(func_801023FC) # $t5, 0x8010
/* 08CF14 801044A4 3C0E8010 */ lui $t6, %hi(func_80101DA8) # $t6, 0x8010
/* 08CF18 801044A8 ADF90004 */ sw $t9, 4($t7)
/* 08CF1C 801044AC 8C880008 */ lw $t0, 8($a0)
/* 08CF20 801044B0 25AD23FC */ addiu $t5, %lo(D_801023FC) # addiu $t5, $t5, 0x23fc
/* 08CF24 801044B4 25CE1DA8 */ addiu $t6, %lo(D_80101DA8) # addiu $t6, $t6, 0x1da8
/* 08CF20 801044B0 25AD23FC */ addiu $t5, %lo(func_801023FC) # addiu $t5, $t5, 0x23fc
/* 08CF24 801044B4 25CE1DA8 */ addiu $t6, %lo(func_80101DA8) # addiu $t6, $t6, 0x1da8
/* 08CF28 801044B8 ADE80008 */ sw $t0, 8($t7)
/* 08CF2C 801044BC 8FAA0074 */ lw $t2, 0x74($sp)
/* 08CF30 801044C0 8D4C0000 */ lw $t4, ($t2)

8
asm/non_matchings/ovl2_6/func_80104520_ovl2.s
View File

@ -13,12 +13,12 @@ glabel func_80104520_ovl2
/* 08CFBC 8010454C 27A90034 */ addiu $t1, $sp, 0x34
/* 08CFC0 80104550 ADE80000 */ sw $t0, ($t7)
/* 08CFC4 80104554 8C990004 */ lw $t9, 4($a0)
/* 08CFC8 80104558 3C0D8010 */ lui $t5, %hi(D_801024E8) # $t5, 0x8010
/* 08CFCC 8010455C 3C0E8010 */ lui $t6, %hi(D_80101DA8) # $t6, 0x8010
/* 08CFC8 80104558 3C0D8010 */ lui $t5, %hi(func_801024E8) # $t5, 0x8010
/* 08CFCC 8010455C 3C0E8010 */ lui $t6, %hi(func_80101DA8) # $t6, 0x8010
/* 08CFD0 80104560 ADF90004 */ sw $t9, 4($t7)
/* 08CFD4 80104564 8C880008 */ lw $t0, 8($a0)
/* 08CFD8 80104568 25AD24E8 */ addiu $t5, %lo(D_801024E8) # addiu $t5, $t5, 0x24e8
/* 08CFDC 8010456C 25CE1DA8 */ addiu $t6, %lo(D_80101DA8) # addiu $t6, $t6, 0x1da8
/* 08CFD8 80104568 25AD24E8 */ addiu $t5, %lo(func_801024E8) # addiu $t5, $t5, 0x24e8
/* 08CFDC 8010456C 25CE1DA8 */ addiu $t6, %lo(func_80101DA8) # addiu $t6, $t6, 0x1da8
/* 08CFE0 80104570 ADE80008 */ sw $t0, 8($t7)
/* 08CFE4 80104574 8FAA0074 */ lw $t2, 0x74($sp)
/* 08CFE8 80104578 8D4C0000 */ lw $t4, ($t2)

8
asm/non_matchings/ovl2_6/func_801045DC_ovl2.s
View File

@ -13,12 +13,12 @@ glabel func_801045DC_ovl2
/* 08D078 80104608 27A90034 */ addiu $t1, $sp, 0x34
/* 08D07C 8010460C ADE80000 */ sw $t0, ($t7)
/* 08D080 80104610 8C990004 */ lw $t9, 4($a0)
/* 08D084 80104614 3C0D8010 */ lui $t5, %hi(D_801024E8) # $t5, 0x8010
/* 08D088 80104618 3C0E8010 */ lui $t6, %hi(D_8010203C) # $t6, 0x8010
/* 08D084 80104614 3C0D8010 */ lui $t5, %hi(func_801024E8) # $t5, 0x8010
/* 08D088 80104618 3C0E8010 */ lui $t6, %hi(func_8010203C) # $t6, 0x8010
/* 08D08C 8010461C ADF90004 */ sw $t9, 4($t7)
/* 08D090 80104620 8C880008 */ lw $t0, 8($a0)
/* 08D094 80104624 25AD24E8 */ addiu $t5, %lo(D_801024E8) # addiu $t5, $t5, 0x24e8
/* 08D098 80104628 25CE203C */ addiu $t6, %lo(D_8010203C) # addiu $t6, $t6, 0x203c
/* 08D094 80104624 25AD24E8 */ addiu $t5, %lo(func_801024E8) # addiu $t5, $t5, 0x24e8
/* 08D098 80104628 25CE203C */ addiu $t6, %lo(func_8010203C) # addiu $t6, $t6, 0x203c
/* 08D09C 8010462C ADE80008 */ sw $t0, 8($t7)
/* 08D0A0 80104630 8FAA0074 */ lw $t2, 0x74($sp)
/* 08D0A4 80104634 8D4C0000 */ lw $t4, ($t2)

8
asm/non_matchings/ovl2_6/func_801046A0_ovl2.s
View File

@ -13,12 +13,12 @@ glabel func_801046A0_ovl2
/* 08D13C 801046CC 27A9002C */ addiu $t1, $sp, 0x2c
/* 08D140 801046D0 ADE80000 */ sw $t0, ($t7)
/* 08D144 801046D4 8C990004 */ lw $t9, 4($a0)
/* 08D148 801046D8 3C0D8010 */ lui $t5, %hi(D_801023FC) # $t5, 0x8010
/* 08D14C 801046DC 3C0E8010 */ lui $t6, %hi(D_80101E5C) # $t6, 0x8010
/* 08D148 801046D8 3C0D8010 */ lui $t5, %hi(func_801023FC) # $t5, 0x8010
/* 08D14C 801046DC 3C0E8010 */ lui $t6, %hi(func_80101E5C) # $t6, 0x8010
/* 08D150 801046E0 ADF90004 */ sw $t9, 4($t7)
/* 08D154 801046E4 8C880008 */ lw $t0, 8($a0)
/* 08D158 801046E8 25AD23FC */ addiu $t5, %lo(D_801023FC) # addiu $t5, $t5, 0x23fc
/* 08D15C 801046EC 25CE1E5C */ addiu $t6, %lo(D_80101E5C) # addiu $t6, $t6, 0x1e5c
/* 08D158 801046E8 25AD23FC */ addiu $t5, %lo(func_801023FC) # addiu $t5, $t5, 0x23fc
/* 08D15C 801046EC 25CE1E5C */ addiu $t6, %lo(func_80101E5C) # addiu $t6, $t6, 0x1e5c
/* 08D160 801046F0 ADE80008 */ sw $t0, 8($t7)
/* 08D164 801046F4 8FAA006C */ lw $t2, 0x6c($sp)
/* 08D168 801046F8 8D4C0000 */ lw $t4, ($t2)

8
asm/non_matchings/ovl2_6/func_8010474C_ovl2.s
View File

@ -11,12 +11,12 @@ glabel func_8010474C_ovl2
/* 08D1E0 80104770 27A9002C */ addiu $t1, $sp, 0x2c
/* 08D1E4 80104774 ADE80000 */ sw $t0, ($t7)
/* 08D1E8 80104778 8C990004 */ lw $t9, 4($a0)
/* 08D1EC 8010477C 3C0D8010 */ lui $t5, %hi(D_80102364) # $t5, 0x8010
/* 08D1F0 80104780 3C0E8010 */ lui $t6, %hi(D_80101F4C) # $t6, 0x8010
/* 08D1EC 8010477C 3C0D8010 */ lui $t5, %hi(func_80102364) # $t5, 0x8010
/* 08D1F0 80104780 3C0E8010 */ lui $t6, %hi(func_80101F4C) # $t6, 0x8010
/* 08D1F4 80104784 ADF90004 */ sw $t9, 4($t7)
/* 08D1F8 80104788 8C880008 */ lw $t0, 8($a0)
/* 08D1FC 8010478C 25AD2364 */ addiu $t5, %lo(D_80102364) # addiu $t5, $t5, 0x2364
/* 08D200 80104790 25CE1F4C */ addiu $t6, %lo(D_80101F4C) # addiu $t6, $t6, 0x1f4c
/* 08D1FC 8010478C 25AD2364 */ addiu $t5, %lo(func_80102364) # addiu $t5, $t5, 0x2364
/* 08D200 80104790 25CE1F4C */ addiu $t6, %lo(func_80101F4C) # addiu $t6, $t6, 0x1f4c
/* 08D204 80104794 ADE80008 */ sw $t0, 8($t7)
/* 08D208 80104798 8FAA006C */ lw $t2, 0x6c($sp)
/* 08D20C 8010479C 00002025 */ move $a0, $zero

8
asm/non_matchings/ovl2_6/func_801047F0_ovl2.s
View File

@ -13,12 +13,12 @@ glabel func_801047F0_ovl2
/* 08D28C 8010481C 27A90034 */ addiu $t1, $sp, 0x34
/* 08D290 80104820 ADE80000 */ sw $t0, ($t7)
/* 08D294 80104824 8C990004 */ lw $t9, 4($a0)
/* 08D298 80104828 3C0D8010 */ lui $t5, %hi(D_801023FC) # $t5, 0x8010
/* 08D29C 8010482C 3C0E8010 */ lui $t6, %hi(D_8010217C) # $t6, 0x8010
/* 08D298 80104828 3C0D8010 */ lui $t5, %hi(func_801023FC) # $t5, 0x8010
/* 08D29C 8010482C 3C0E8010 */ lui $t6, %hi(func_8010217C) # $t6, 0x8010
/* 08D2A0 80104830 ADF90004 */ sw $t9, 4($t7)
/* 08D2A4 80104834 8C880008 */ lw $t0, 8($a0)
/* 08D2A8 80104838 25AD23FC */ addiu $t5, %lo(D_801023FC) # addiu $t5, $t5, 0x23fc
/* 08D2AC 8010483C 25CE217C */ addiu $t6, %lo(D_8010217C) # addiu $t6, $t6, 0x217c
/* 08D2A8 80104838 25AD23FC */ addiu $t5, %lo(func_801023FC) # addiu $t5, $t5, 0x23fc
/* 08D2AC 8010483C 25CE217C */ addiu $t6, %lo(func_8010217C) # addiu $t6, $t6, 0x217c
/* 08D2B0 80104840 ADE80008 */ sw $t0, 8($t7)
/* 08D2B4 80104844 8FAA0074 */ lw $t2, 0x74($sp)
/* 08D2B8 80104848 8D4C0000 */ lw $t4, ($t2)

8
asm/non_matchings/ovl2_6/func_801048A4_ovl2.s
View File

@ -13,12 +13,12 @@ glabel func_801048A4_ovl2
/* 08D340 801048D0 27A90034 */ addiu $t1, $sp, 0x34
/* 08D344 801048D4 ADE80000 */ sw $t0, ($t7)
/* 08D348 801048D8 8C990004 */ lw $t9, 4($a0)
/* 08D34C 801048DC 3C0D8010 */ lui $t5, %hi(D_801023FC) # $t5, 0x8010
/* 08D350 801048E0 3C0E8010 */ lui $t6, %hi(D_801021BC) # $t6, 0x8010
/* 08D34C 801048DC 3C0D8010 */ lui $t5, %hi(func_801023FC) # $t5, 0x8010
/* 08D350 801048E0 3C0E8010 */ lui $t6, %hi(func_801021BC) # $t6, 0x8010
/* 08D354 801048E4 ADF90004 */ sw $t9, 4($t7)
/* 08D358 801048E8 8C880008 */ lw $t0, 8($a0)
/* 08D35C 801048EC 25AD23FC */ addiu $t5, %lo(D_801023FC) # addiu $t5, $t5, 0x23fc
/* 08D360 801048F0 25CE21BC */ addiu $t6, %lo(D_801021BC) # addiu $t6, $t6, 0x21bc
/* 08D35C 801048EC 25AD23FC */ addiu $t5, %lo(func_801023FC) # addiu $t5, $t5, 0x23fc
/* 08D360 801048F0 25CE21BC */ addiu $t6, %lo(func_801021BC) # addiu $t6, $t6, 0x21bc
/* 08D364 801048F4 ADE80008 */ sw $t0, 8($t7)
/* 08D368 801048F8 8FAA0074 */ lw $t2, 0x74($sp)
/* 08D36C 801048FC 8D4C0000 */ lw $t4, ($t2)

8
asm/non_matchings/ovl2_6/func_80104958_ovl2.s
View File

@ -13,12 +13,12 @@ glabel func_80104958_ovl2
/* 08D3F4 80104984 27A90034 */ addiu $t1, $sp, 0x34
/* 08D3F8 80104988 ADE80000 */ sw $t0, ($t7)
/* 08D3FC 8010498C 8C990004 */ lw $t9, 4($a0)
/* 08D400 80104990 3C0D8010 */ lui $t5, %hi(D_80102364) # $t5, 0x8010
/* 08D404 80104994 3C0E8010 */ lui $t6, %hi(D_801021FC) # $t6, 0x8010
/* 08D400 80104990 3C0D8010 */ lui $t5, %hi(func_80102364) # $t5, 0x8010
/* 08D404 80104994 3C0E8010 */ lui $t6, %hi(func_801021FC) # $t6, 0x8010
/* 08D408 80104998 ADF90004 */ sw $t9, 4($t7)
/* 08D40C 8010499C 8C880008 */ lw $t0, 8($a0)
/* 08D410 801049A0 25AD2364 */ addiu $t5, %lo(D_80102364) # addiu $t5, $t5, 0x2364
/* 08D414 801049A4 25CE21FC */ addiu $t6, %lo(D_801021FC) # addiu $t6, $t6, 0x21fc
/* 08D410 801049A0 25AD2364 */ addiu $t5, %lo(func_80102364) # addiu $t5, $t5, 0x2364
/* 08D414 801049A4 25CE21FC */ addiu $t6, %lo(func_801021FC) # addiu $t6, $t6, 0x21fc
/* 08D418 801049A8 ADE80008 */ sw $t0, 8($t7)
/* 08D41C 801049AC 8FAA0074 */ lw $t2, 0x74($sp)
/* 08D420 801049B0 00002025 */ move $a0, $zero

8
asm/non_matchings/ovl2_6/func_80104A08_ovl2.s
View File

@ -13,12 +13,12 @@ glabel func_80104A08_ovl2
/* 08D4A4 80104A34 27A9002C */ addiu $t1, $sp, 0x2c
/* 08D4A8 80104A38 ADE80000 */ sw $t0, ($t7)
/* 08D4AC 80104A3C 8C990004 */ lw $t9, 4($a0)
/* 08D4B0 80104A40 3C0D8010 */ lui $t5, %hi(D_80102364) # $t5, 0x8010
/* 08D4B4 80104A44 3C0E8010 */ lui $t6, %hi(D_801021FC) # $t6, 0x8010
/* 08D4B0 80104A40 3C0D8010 */ lui $t5, %hi(func_80102364) # $t5, 0x8010
/* 08D4B4 80104A44 3C0E8010 */ lui $t6, %hi(func_801021FC) # $t6, 0x8010
/* 08D4B8 80104A48 ADF90004 */ sw $t9, 4($t7)
/* 08D4BC 80104A4C 8C880008 */ lw $t0, 8($a0)
/* 08D4C0 80104A50 25AD2364 */ addiu $t5, %lo(D_80102364) # addiu $t5, $t5, 0x2364
/* 08D4C4 80104A54 25CE21FC */ addiu $t6, %lo(D_801021FC) # addiu $t6, $t6, 0x21fc
/* 08D4C0 80104A50 25AD2364 */ addiu $t5, %lo(func_80102364) # addiu $t5, $t5, 0x2364
/* 08D4C4 80104A54 25CE21FC */ addiu $t6, %lo(func_801021FC) # addiu $t6, $t6, 0x21fc
/* 08D4C8 80104A58 ADE80008 */ sw $t0, 8($t7)
/* 08D4CC 80104A5C 8FAA006C */ lw $t2, 0x6c($sp)
/* 08D4D0 80104A60 00002025 */ move $a0, $zero

8
asm/non_matchings/ovl2_6/func_80104AB4_ovl2.s
View File

@ -13,12 +13,12 @@ glabel func_80104AB4_ovl2
/* 08D550 80104AE0 27A9002C */ addiu $t1, $sp, 0x2c
/* 08D554 80104AE4 ADE80000 */ sw $t0, ($t7)
/* 08D558 80104AE8 8C990004 */ lw $t9, 4($a0)
/* 08D55C 80104AEC 3C0D8010 */ lui $t5, %hi(D_801024E8) # $t5, 0x8010
/* 08D560 80104AF0 3C0E8010 */ lui $t6, %hi(D_8010221C) # $t6, 0x8010
/* 08D55C 80104AEC 3C0D8010 */ lui $t5, %hi(func_801024E8) # $t5, 0x8010
/* 08D560 80104AF0 3C0E8010 */ lui $t6, %hi(func_8010221C) # $t6, 0x8010
/* 08D564 80104AF4 ADF90004 */ sw $t9, 4($t7)
/* 08D568 80104AF8 8C880008 */ lw $t0, 8($a0)
/* 08D56C 80104AFC 25AD24E8 */ addiu $t5, %lo(D_801024E8) # addiu $t5, $t5, 0x24e8
/* 08D570 80104B00 25CE221C */ addiu $t6, %lo(D_8010221C) # addiu $t6, $t6, 0x221c
/* 08D56C 80104AFC 25AD24E8 */ addiu $t5, %lo(func_801024E8) # addiu $t5, $t5, 0x24e8
/* 08D570 80104B00 25CE221C */ addiu $t6, %lo(func_8010221C) # addiu $t6, $t6, 0x221c
/* 08D574 80104B04 ADE80008 */ sw $t0, 8($t7)
/* 08D578 80104B08 8FAA006C */ lw $t2, 0x6c($sp)
/* 08D57C 80104B0C 00002025 */ move $a0, $zero

8
asm/non_matchings/ovl2_6/func_80104B70_ovl2.s
View File

@ -13,12 +13,12 @@ glabel func_80104B70_ovl2
/* 08D60C 80104B9C 27A90034 */ addiu $t1, $sp, 0x34
/* 08D610 80104BA0 ADE80000 */ sw $t0, ($t7)
/* 08D614 80104BA4 8C990004 */ lw $t9, 4($a0)
/* 08D618 80104BA8 3C0D8010 */ lui $t5, %hi(D_80102364) # $t5, 0x8010
/* 08D61C 80104BAC 3C0E8010 */ lui $t6, %hi(D_80102324) # $t6, 0x8010
/* 08D618 80104BA8 3C0D8010 */ lui $t5, %hi(func_80102364) # $t5, 0x8010
/* 08D61C 80104BAC 3C0E8010 */ lui $t6, %hi(func_80102324) # $t6, 0x8010
/* 08D620 80104BB0 ADF90004 */ sw $t9, 4($t7)
/* 08D624 80104BB4 8C880008 */ lw $t0, 8($a0)
/* 08D628 80104BB8 25AD2364 */ addiu $t5, %lo(D_80102364) # addiu $t5, $t5, 0x2364
/* 08D62C 80104BBC 25CE2324 */ addiu $t6, %lo(D_80102324) # addiu $t6, $t6, 0x2324
/* 08D628 80104BB8 25AD2364 */ addiu $t5, %lo(func_80102364) # addiu $t5, $t5, 0x2364
/* 08D62C 80104BBC 25CE2324 */ addiu $t6, %lo(func_80102324) # addiu $t6, $t6, 0x2324
/* 08D630 80104BC0 ADE80008 */ sw $t0, 8($t7)
/* 08D634 80104BC4 8FAA0074 */ lw $t2, 0x74($sp)
/* 08D638 80104BC8 8D4C0000 */ lw $t4, ($t2)

2
src/ovl0/ovl0_1.c
View File

@ -480,8 +480,6 @@ void func_800037A4(void) {
D_80048D9C += D_80048D98;
}
void func_800037F0(u32 arg0, u32 arg1, u8* arg2, u32 arg3) {
func_80003788(arg0, arg2, arg3);
func_80002FC0(arg2, arg3, (void*) func_800037A4, arg1);

54
src/ovl0/ovl0_2_5.c
View File

@ -1041,24 +1041,9 @@ void func_800068E4(void *arg0) {
s32 phi_s0_2;
D_800492DC = 0;
if (osRecvMesg(&D_80049320, 0, 0) != -1) {
loop_1:
if (osRecvMesg(&D_80049320, 0, 0) != -1) {
goto loop_1;
}
}
if (osRecvMesg(&D_80049340, 0, 0) != -1) {
loop_3:
if (osRecvMesg(&D_80049340, 0, 0) != -1) {
goto loop_3;
}
}
if (osRecvMesg(&D_800492C0, 0, 0) != -1) {
loop_5:
if (osRecvMesg(&D_800492C0, 0, 0) != -1) {
goto loop_5;
}
}
while (osRecvMesg(&D_80049320, NULL, 0) != -1);
while (osRecvMesg(&D_80049340, NULL, 0) != -1);
while (osRecvMesg(&D_800492C0, NULL, 0) != -1);
D_8004A3F0 = 0;
D_8004A3F4 = -1;
D_8004A450 = 1;
@ -1084,12 +1069,8 @@ loop_11:
goto loop_11;
}
}
if (osRecvMesg(&D_800492C0, 0, 0) != -1) {
loop_13:
if (osRecvMesg(&D_800492C0, 0, 0) != -1) {
goto loop_13;
}
}
while (osRecvMesg(&D_800492C0, 0, 0) != -1);
D_8004A42C = osGetCount();
arg0->unk8(arg0);
D_8003DCA4 = (u32) (D_8003DCA4 + 1);
@ -1097,8 +1078,6 @@ loop_13:
if (func_800067E0() == 0) {
if ((((u32) D_8003DCA4 % (u32) D_800492DA) != 0) || (func_80006628(0), D_8004A42C = osGetCount(), arg0->unk10(arg0), D_8003DCA8 = (s32) (D_8003DCA8 + 1), D_8004A434 = (u32) ((u32) (osGetCount() - D_8004A42C) / 0xB9BU), (func_800067E0() == 0))) {
goto loop_10;
} else {
}
}
} else {
@ -1127,30 +1106,13 @@ loop_22:
if (func_800067E0() == 0) {
if (((((u32) D_8003DCA4 % (u32) D_800492DA) != 0) || (func_80006628(1) == 0)) || (D_8004A42C = osGetCount(), arg0->unk10(arg0), D_8003DCA8 = (s32) (D_8003DCA8 + 1), D_8004A434 = (u32) ((u32) (osGetCount() - D_8004A42C) / 0xB9BU), (func_800067E0() == 0))) {
goto loop_19;
} else {
}
}
}
func_80006740();
if (osRecvMesg(&D_80049320, 0, 0) != -1) {
loop_29:
if (osRecvMesg(&D_80049320, 0, 0) != -1) {
goto loop_29;
}
}
if (osRecvMesg(&D_80049340, 0, 0) != -1) {
loop_31:
if (osRecvMesg(&D_80049340, 0, 0) != -1) {
goto loop_31;
}
}
if (osRecvMesg(&D_800492C0, 0, 0) != -1) {
loop_33:
if (osRecvMesg(&D_800492C0, 0, 0) != -1) {
goto loop_33;
}
}
while (osRecvMesg(&D_80049320, 0, 0) != -1);
while (osRecvMesg(&D_80049340, 0, 0) != -1);
while (osRecvMesg(&D_800492C0, 0, 0) != -1);
func_80007CE8(0);
D_800492DC = 2;
}

8
src/ovl2/ovl2_5.c
View File

@ -437,7 +437,7 @@ void func_800FE154_ovl2(void *arg0, s32 arg1, void *arg2) {
sp18C = temp_f6;
sp180 = temp_f6;
sp17C = temp_t7->tc + temp_t7->unk18;
if ((arg2(&sp184, temp_a1, &sp16C, &sp168, &sp164) != 0) && (func_80101920_ovl2(sp164, sp168, 0, &D_8012B9A0) != 0)) {
if ((arg2(&sp184, temp_a1, &sp16C, &sp168, &sp164) != 0) && (func_80101920(sp164, sp168, 0, &D_8012B9A0) != 0)) {
func_800FDE6C_ovl2(sp194);
func_800FDF88_ovl2(arg0, sp194, arg1);
phi_a3 = sp194 + 0x28;
@ -467,11 +467,11 @@ void func_800FE154_ovl2(void *arg0, s32 arg1, void *arg2) {
temp_a0 = D_8012B9AC;
temp_v0_2 = arg2(temp_a0, temp_a0 + 0xC, &sp14C, &sp13C, &sp134);
sp12C = temp_v0_2;
if ((temp_v0_2 == 0) || (func_80101920_ovl2(sp134, sp13C, 0, &D_8012B9A0) != 0)) {
if ((temp_v0_2 == 0) || (func_80101920(sp134, sp13C, 0, &D_8012B9A0) != 0)) {
temp_v0_3 = D_8012B9AC;
temp_v0_4 = arg2(temp_v0_3 + 0x18, temp_v0_3 + 0x24, &sp140, &sp138, &sp130);
phi_v1 = temp_v0_4;
if ((temp_v0_4 == 0) || (sp128 = temp_v0_4, phi_v1 = sp128, (func_80101920_ovl2(sp130, sp138, 0, &D_8012B9A0) != 0))) {
if ((temp_v0_4 == 0) || (sp128 = temp_v0_4, phi_v1 = sp128, (func_80101920(sp130, sp138, 0, &D_8012B9A0) != 0))) {
if ((phi_v1 != 0) || (sp12C != 0)) {
sp128 = phi_v1;
func_800FDF88_ovl2(arg0, sp194, arg1);
@ -621,7 +621,7 @@ block_50:
spC8 = sp194->cn;
spBC = spC8;
spB8 = sp194->tc + sp194->unk18;
if ((arg2(sp150, temp_f14, &spC0, temp_a1_4, &spA8, &spA4, &spA0) != 0) && (func_80101920_ovl2(spA0, spA4, 0, &D_8012B9A0) != 0)) {
if ((arg2(sp150, temp_f14, &spC0, temp_a1_4, &spA8, &spA4, &spA0) != 0) && (func_80101920(spA0, spA4, 0, &D_8012B9A0) != 0)) {
temp_v0_9 = D_8012B9AC;
temp_f0_5 = spA4->unk0;
temp_f2_4 = spA4->unk8;

3
src/ovl2/ovl2_6.c
View File

@ -3,7 +3,7 @@
#include <ultra64.h>
#include <PR/gs2dex.h>
u32 func_80101920(Vector *a0, struct Normal *a1, Vector *a2, struct Normal *a3);
u32 func_80101BA0_ovl2(Vector *a0, struct Normal *a1, Vector *a2, struct Normal *a3);
u32 func_80101BA0(Vector *a0, struct Normal *a1, Vector *a2, struct Normal *a3);
struct UNK_D_8012BBF8 {
struct UNK_D_8012BBF8_unk0 *unk0;
@ -70,7 +70,6 @@ void func_800FF5E0_ovl2(s32 arg0, f32 arg1, f32 arg2) {
extern u32 D_8012B9B0;
struct UNK_D_800D478C {
u8 unk0;
u8 unk1;

86
src/ovl2/ovl2_6_2.c
View File

@ -323,7 +323,7 @@ u32 func_80101920(struct CollisionTriangle *arg0, struct Normal *arg1, Vector *a
GLOBAL_ASM("asm/non_matchings/ovl2_6/func_80101920.s")
#endif
u32 func_80101BA0_ovl2(struct CollisionTriangle *triangle, struct Normal *normal, Vector *va, Vector *vb) {
u32 func_80101BA0(struct CollisionTriangle *triangle, struct Normal *normal, Vector *va, Vector *vb) {
u32 code = triangle->normalType;
if (!(code & NON_SOLID)) {
if ((code & NO_SHADOW) && D_8012BD00 >> 31 == 0) {
@ -550,7 +550,7 @@ u8 func_80102324_ovl2(struct CollisionTriangle *arg0, struct Normal *arg1, struc
// unk44 in CollisionState (or at least one of them)
#ifdef MIPS_TO_C
? func_80102364_ovl2(void *arg0, s32 arg1) {
? func_80102364(void *arg0, s32 arg1) {
f32 temp_f0;
struct Normal *temp_v0;
f32 phi_f2;
@ -1287,7 +1287,7 @@ void func_80103930(Vector *arg0, Vector *arg1, struct Normal *arg2, s32 arg3, s3
newColState.unk40 = &func_80101920;
newColState.unk34 = NULL;
newColState.unk38 = NULL;
func_80103528_ovl2(arg3, arg4, arg5, arg6, arg7);
func_80103528(arg3, arg4, arg5, arg6, arg7);
}
extern u32 func_80102364(struct Normal *a0, s32 arg1);
@ -1318,7 +1318,7 @@ void func_80103AA0_ovl2(Vector *arg0, Vector *arg1, struct Normal *arg2, s32 arg
newColState.unk40 = &func_80101920;
newColState.unk34 = NULL;
newColState.unk38 = NULL;
func_80103528_ovl2(arg3, arg4, arg5, arg6, arg7);
func_80103528(arg3, arg4, arg5, arg6, arg7);
}
#ifdef MIPS_TO_C
@ -1419,7 +1419,6 @@ void func_80103DE4(Vector *arg0, Vector *arg1, struct Normal *arg2, struct Norma
func_80103B58_ovl2(arg4, arg5, arg6, arg7, arg8);
}
void func_80102364_ovl2(void);
void func_80103EA0_ovl2(Vector *arg0, Vector *arg1, struct Normal *arg2, struct Normal *arg3, s32 arg4,
s32 arg5, s32 arg6, s32 arg7) {
struct CollisionState newColState;
@ -1427,7 +1426,7 @@ void func_80103EA0_ovl2(Vector *arg0, Vector *arg1, struct Normal *arg2, struct
newColState.currPos = *arg0;
newColState.nextPos = *arg1;
newColState.someNormal = arg2;
newColState.unk44 = &func_80102364_ovl2;
newColState.unk44 = &func_80102364;
newColState.unk40 = &func_80101920;
newColState.unk34 = 0;
newColState.unk38 = 0;
@ -1443,8 +1442,8 @@ void func_80103F58_ovl2(Vector *arg0, Vector *arg1, struct Normal *arg2, struct
newColState.currPos = *arg0;
newColState.nextPos = *arg1;
newColState.someNormal = arg2;
newColState.unk44 = &func_80102364_ovl2;
newColState.unk40 = &func_80101BA0_ovl2;
newColState.unk44 = &func_80102364;
newColState.unk40 = &func_80101BA0;
newColState.unk34 = 0;
newColState.unk38 = 0;
newColState.unk3C = NULL;
@ -1464,13 +1463,9 @@ void func_80104010_ovl2(void *arg0, void *arg1, s32 arg2, s32 arg3, s32 arg4, s3
? sp20;
gCollisionState = &sp20;
sp28.unk0 = arg0->unk0;
sp28.unk4 = arg0->unk4;
sp28.unk8 = arg0->unk8;
sp34.unk0 = arg1->unk0;
sp34.unk4 = arg1->unk4;
sp34.unk8 = arg1->unk8;
sp64 = &D_80102364;
sp28.currPos = *arg0;
sp28.nextPos = *arg1;
sp64 = &func_80102364;
sp60 = &func_80101920;
sp58 = 0;
sp5C = 0;
@ -1502,7 +1497,7 @@ void func_801040CC_ovl2(void *arg0, void *arg1, s32 arg2, s32 arg3, s32 arg4, s3
sp34.unk4 = arg1->unk4;
sp34.unk8 = arg1->unk8;
sp4C = 0;
sp64 = &D_80102364;
sp64 = &func_80102364;
sp60 = &func_80101D50;
sp54 = 0;
sp58 = 0;
@ -1533,8 +1528,8 @@ void func_80104184_ovl2(void *arg0, void *arg1, s32 arg2, s32 arg3, s32 arg4, s3
sp34.unk4 = arg1->unk4;
sp34.unk8 = arg1->unk8;
sp4C = 0;
sp64 = &D_80102364;
sp60 = &D_80101E14;
sp64 = &func_80102364;
sp60 = &func_80101E14;
sp54 = 0;
sp58 = 0;
sp5C = arg2;
@ -1563,7 +1558,7 @@ void func_8010423C_ovl2(void *arg0, void *arg1, s32 arg2, s32 arg3, s32 arg4, s3
sp34.unk0 = arg1->unk0;
sp34.unk4 = arg1->unk4;
sp34.unk8 = arg1->unk8;
sp64 = &D_801023FC;
sp64 = &func_801023FC;
sp60 = &func_80101920;
sp54 = 0;
sp58 = 0;
@ -1594,7 +1589,7 @@ void func_801042F4_ovl2(void *arg0, void *arg1, s32 arg2, s32 arg3, s32 arg4, s3
sp34.unk0 = arg1->unk0;
sp34.unk4 = arg1->unk4;
sp34.unk8 = arg1->unk8;
sp64 = &D_801023FC;
sp64 = &func_801023FC;
sp60 = &func_80101920;
sp54 = 0;
sp5C = 0;
@ -1626,8 +1621,8 @@ void func_801043B0_ovl2(void *arg0, void *arg1, s32 arg2, s32 arg3, s32 arg4, s3
sp34.unk4 = arg1->unk4;
sp34.unk8 = arg1->unk8;
sp4C = 0;
sp64 = &D_801023FC;
sp60 = &D_80101E14;
sp64 = &func_801023FC;
sp60 = &func_80101E14;
sp54 = 0;
sp58 = 0;
sp5C = arg2;
@ -1657,8 +1652,8 @@ void func_80104468_ovl2(void *arg0, void *arg1, s32 arg2, s32 arg3, s32 arg4, s3
sp34.unk4 = arg1->unk4;
sp34.unk8 = arg1->unk8;
sp4C = 0;
sp64 = &D_801023FC;
sp60 = &D_80101DA8;
sp64 = &func_801023FC;
sp60 = &func_80101DA8;
sp58 = 0;
sp5C = 0;
sp54 = arg2;
@ -1688,8 +1683,8 @@ void func_80104520_ovl2(void *arg0, void *arg1, s32 arg2, s32 arg3, s32 arg4, s3
sp34.unk4 = arg1->unk4;
sp34.unk8 = arg1->unk8;
sp4C = 0;
sp64 = &D_801024E8;
sp60 = &D_80101DA8;
sp64 = &func_801024E8;
sp60 = &func_80101DA8;
sp5C = 0;
sp54 = arg2;
sp58 = arg3;
@ -1721,8 +1716,8 @@ void func_801045DC_ovl2(void *arg0, void *arg1, u16 arg2, u16 arg3, s32 arg4, s3
sp34.unk4 = arg1->unk4;
sp34.unk8 = arg1->unk8;
sp4C = 0;
sp64 = &D_801024E8;
sp60 = &D_8010203C;
sp64 = &func_801024E8;
sp60 = &func_8010203C;
sp54 = 0;
sp58 = 0;
sp5C = 0;
@ -1755,8 +1750,8 @@ void func_801046A0_ovl2(void *arg0, void *arg1, s32 arg2, s32 arg3, s32 arg4, s3
sp2C.unk8 = arg1->unk8;
sp44 = 0;
sp54 = 0;
sp5C = &D_801023FC;
sp58 = &D_80101E5C;
sp5C = &func_801023FC;
sp58 = &func_80101E5C;
sp4C = 0;
sp50 = 0;
func_80103D80_ovl2(arg2, arg3, arg4, arg5);
@ -1786,8 +1781,8 @@ void func_8010474C_ovl2(void *arg0, void *arg1) {
sp2C.unk8 = arg1->unk8;
sp44 = 0;
sp54 = 0;
sp5C = &D_80102364;
sp58 = &D_80101F4C;
sp5C = &func_80102364;
sp58 = &func_80101F4C;
sp4C = 0;
sp50 = 0;
func_80103D80_ovl2(0, 0, 0, 0);
@ -1816,8 +1811,8 @@ void func_801047F0_ovl2(void *arg0, void *arg1, s32 arg2, s32 arg3, s32 arg4, s3
sp34.unk4 = arg1->unk4;
sp34.unk8 = arg1->unk8;
sp4C = 0;
sp64 = &D_801023FC;
sp60 = &D_8010217C;
sp64 = &func_801023FC;
sp60 = &func_8010217C;
sp54 = 0;
sp58 = 0;
sp5C = 0;
@ -1847,8 +1842,8 @@ void func_801048A4_ovl2(void *arg0, void *arg1, s32 arg2, s32 arg3, s32 arg4, s3
sp34.unk4 = arg1->unk4;
sp34.unk8 = arg1->unk8;
sp4C = 0;
sp64 = &D_801023FC;
sp60 = &D_801021BC;
sp64 = &func_801023FC;
sp60 = &func_801021BC;
sp54 = 0;
sp58 = 0;
sp5C = 0;
@ -1878,8 +1873,8 @@ void func_80104958_ovl2(void *arg0, void *arg1, s32 arg2, s32 arg3, s32 arg4) {
sp34.unk4 = arg1->unk4;
sp34.unk8 = arg1->unk8;
sp4C = 0;
sp64 = &D_80102364;
sp60 = &D_801021FC;
sp64 = &func_80102364;
sp60 = &func_801021FC;
sp54 = 0;
sp58 = 0;
sp5C = 0;
@ -1909,8 +1904,8 @@ void func_80104A08_ovl2(void *arg0, void *arg1, s32 arg2, s32 arg3, s32 arg4) {
sp2C.unk4 = arg1->unk4;
sp2C.unk8 = arg1->unk8;
sp44 = 0;
sp5C = &D_80102364;
sp58 = &D_801021FC;
sp5C = &func_80102364;
sp58 = &func_801021FC;
sp4C = 0;
sp50 = 0;
sp54 = 0;
@ -1943,8 +1938,8 @@ void func_80104AB4_ovl2(void *arg0, void *arg1, u16 arg2, u16 arg3, s32 arg4) {
sp2C.unk8 = arg1->unk8;
sp44 = 0;
sp54 = 0;
sp5C = &D_801024E8;
sp58 = &D_8010221C;
sp5C = &func_801024E8;
sp58 = &func_8010221C;
sp4C = 0;
sp50 = 0;
sp60 = arg2;
@ -1975,8 +1970,8 @@ void func_80104B70_ovl2(void *arg0, void *arg1, s32 arg2, s32 arg3, s32 arg4, s3
sp34.unk4 = arg1->unk4;
sp34.unk8 = arg1->unk8;
sp4C = 0;
sp64 = &D_80102364;
sp60 = &D_80102324;
sp64 = &func_80102364;
sp60 = &func_80102324;
sp54 = 0;
sp58 = 0;
sp5C = 0;
@ -2031,8 +2026,7 @@ u8 func_80104C24_ovl2(Vector *cPos, Vector *nPos) {
f32 temp_f8;
f32 phi_f2;
func_80103AA0_ovl2(arg0, arg1, arg2, arg3, &sp6C, &sp68, &sp64, arg7);
if (ERROR(Read from unset register $v0) != 0) {
if (func_80103AA0_ovl2(arg0, arg1, arg2, arg3, &sp6C, &sp68, &sp64, arg7) != 0) {
temp_f8 = sp6C - arg0->x;
sp58 = temp_f8;
temp_f4 = sp70 - arg0->y;

15
src/ovl7/yakulib.c
View File

@ -291,12 +291,15 @@ void func_801BC978_ovl7(s32 *arg0) {
gSPSetLights1(gDisplayListHeads[0]++, (*temp_a2));
gSPSetLights1(gDisplayListHeads[1]++, (*temp_a2));
}
func_800AB174(arg0);
// gSPSetLights1(gDisplayListHeads[0]++, D_800BE548);
// gSPSetLights1(gDisplayListHeads[1]++, D_800BE548);
gSPNumLights(gDisplayListHeads[0]++,NUMLIGHTS_1);
gSPLight(gDisplayListHeads[0]++, &D_800BE548.l[0], LIGHT_1);
gSPLight(gDisplayListHeads[0]++, &D_800BE548.a, LIGHT_2);
gSPLight(gDisplayListHeads[0]++, &D_800BE548.l[0], LIGHT_1);
gSPNumLights(gDisplayListHeads[1]++,NUMLIGHTS_1);
gSPLight(gDisplayListHeads[1]++, &D_800BE548.l[0], LIGHT_1);
gSPLight(gDisplayListHeads[1]++, &D_800BE548.a, LIGHT_2);
gSPLight(gDisplayListHeads[1]++, &D_800BE548.l[0], LIGHT_1);
break;
case 16:
gSPSegment(gDisplayListHeads[0]++, 4, D_800DF4D0[temp_v0]);
@ -304,8 +307,7 @@ void func_801BC978_ovl7(s32 *arg0) {
if (temp_a2 != NULL) {
gSPSetLights1(gDisplayListHeads[0]++, (*temp_a2));
gSPSetLights1(gDisplayListHeads[1]++, (*temp_a2));
}
func_800AB244(arg0);
} func_800AB244(arg0);
gSPSetLights1(gDisplayListHeads[0]++, D_800BE548);
gSPSetLights1(gDisplayListHeads[1]++, D_800BE548);
break;
@ -314,10 +316,12 @@ void func_801BC978_ovl7(s32 *arg0) {
gSPSegment(gDisplayListHeads[0]++, 4, D_800DF4D0[temp_v0]);
gSPSegment(gDisplayListHeads[1]++, 4, D_800DF4D0[temp_v0]);
if (temp_a2 != 0) {
temp_a2 = temp_a2;
gSPSetLights1(gDisplayListHeads[0]++, (*temp_a2));
gSPSetLights1(gDisplayListHeads[1]++, (*temp_a2));
}
func_800AB314(arg0);
// if (&D_800BE548) {}
gSPSetLights1(gDisplayListHeads[0]++, D_800BE548);
gSPSetLights1(gDisplayListHeads[1]++, D_800BE548);
break;
@ -330,6 +334,9 @@ void func_801BC978_ovl7(s32 *arg0) {
gSPSetLights1(gDisplayListHeads[1]++, (*temp_a2));
}
func_800AB3F4(arg0);
if (&D_800BE548) {
}
gSPSetLights1(gDisplayListHeads[0]++, D_800BE548);
gSPSetLights1(gDisplayListHeads[1]++, D_800BE548);
}

4
tools/non_matchings.txt
View File

@ -970,12 +970,12 @@ asm/non_matchings/ovl2_6/func_8010133C_ovl2.s
asm/non_matchings/ovl2_6/func_8010137C_ovl2.s
asm/non_matchings/ovl2_6/func_80101400_ovl2.s
asm/non_matchings/ovl2_6/func_80101920.s
asm/non_matchings/ovl2_6/func_80101BA0_ovl2.s
asm/non_matchings/ovl2_6/func_80101BA0.s
asm/non_matchings/ovl2_6/func_80101E14_ovl2.s
asm/non_matchings/ovl2_6/func_8010203C_ovl2.s
asm/non_matchings/ovl2_6/func_801021FC_ovl2.s
asm/non_matchings/ovl2_6/func_8010221C_ovl2.s
asm/non_matchings/ovl2_6/func_80102364_ovl2.s
asm/non_matchings/ovl2_6/func_80102364.s
asm/non_matchings/ovl2_6/func_801023FC_ovl2.s
asm/non_matchings/ovl2_6/func_801024E8_ovl2.s
asm/non_matchings/ovl2_6/func_80102570_ovl2.s

30
undefined_syms.txt
View File

@ -1704,7 +1704,7 @@ D_8012896C = 0x8012896C;
D_8012B9AC = 0x8012B9AC;
func_80011180_ovl2 = 0x80011180;
D_8012B9A0 = 0x8012B9A0;
func_80101920_ovl2 = 0x80101920;
func_80101920 = 0x80101920;
func_800FDE6C_ovl2 = 0x800FDE6C;
func_800FDF88_ovl2 = 0x800FDF88;
func_800FDFF4_ovl2 = 0x800FDFF4;
@ -1784,28 +1784,28 @@ func_80112ED4_ovl2 = 0x80112ED4;
func_801033A8_ovl2 = 0x801033A8;
D_80128A60 = 0x80128A60;
D_80128A64 = 0x80128A64;
D_801024E8 = 0x801024E8;
func_801024E8 = 0x801024E8;
func_80101920 = 0x80101920;
func_80103528_ovl2 = 0x80103528;
D_80102364 = 0x80102364;
D_801023FC = 0x801023FC;
func_80103528 = 0x80103528;
func_80102364 = 0x80102364;
func_801023FC = 0x801023FC;
D_80128A68 = 0x80128A68;
D_80128A6C = 0x80128A6C;
func_80103B58_ovl2 = 0x80103B58;
D_80128A70 = 0x80128A70;
D_80101BA0 = 0x80101BA0;
func_80101D50 = 0x80101D50;
D_80101E14 = 0x80101E14;
D_80101DA8 = 0x80101DA8;
D_8010203C = 0x8010203C;
D_80101E5C = 0x80101E5C;
func_80101E14 = 0x80101E14;
func_80101DA8 = 0x80101DA8;
func_8010203C = 0x8010203C;
func_80101E5C = 0x80101E5C;
func_80103D80_ovl2 = 0x80103D80;
D_80101F4C = 0x80101F4C;
D_8010217C = 0x8010217C;
D_801021BC = 0x801021BC;
D_801021FC = 0x801021FC;
D_8010221C = 0x8010221C;
D_80102324 = 0x80102324;
func_80101F4C = 0x80101F4C;
func_8010217C = 0x8010217C;
func_801021BC = 0x801021BC;
func_801021FC = 0x801021FC;
func_8010221C = 0x8010221C;
func_80102324 = 0x80102324;
func_80103AA0_ovl2 = 0x80103AA0;
D_80128A74 = 0x80128A74;
func_80112A40_ovl2 = 0x80112A40;