izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Matches and documenting (#388)

Browse Source 
* Near match for render_3d_model

* Stack diffs only on render_3d_model

* Matched render_3d_model!

* Delete accidentally added files.

* Some naming of things

* Match func_8007C660

* Update some more names

* WIP func_80012F94

* Fix non equivalent build

* Update func_80012F94 score

* Update score
This commit is contained in:
Ryan Myers
2023-04-28 14:54:27 -04:00
committed by GitHub
parent 6e8ee67cf6
commit 3f37109e59
33 changed files with 407 additions and 1126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+9 -9
View File
@@ -128,25 +128,25 @@ s32 is_drumstick_unlocked(void) {
```
<!-- README_SCORE_BEGIN -->
As of April 24, 2023, this is our current score:
As of April 28, 2023, this is our current score:
```
=================================================
ADVENTURE ONE (ASM -> C Decompilation)
---------------- 51.18% Complete ----------------
# Decompiled functions: 1501
# GLOBAL_ASM remaining: 331
---------------- 51.57% Complete ----------------
# Decompiled functions: 1503
# GLOBAL_ASM remaining: 329
# NON_MATCHING functions: 12
# NON_EQUIVALENT WIP functions: 64
------------------ Game Status ------------------
Balloons: 25/47, Keys: 3/4, Trophies: 2/5
Balloons: 26/47, Keys: 3/4, Trophies: 2/5
T.T. Amulets: 2/4, Wizpig Amulets: 2/4
-------------------------------------------------
We are racing in Treasure Caves. (Lap 3/3)
We are racing the octopus boss Bubbler. (Lap 1/3)
=================================================
ADVENTURE TWO (Cleanup & Documentation)
---------------- 25.01% Complete ----------------
# Documented functions: 511
# Undocumented remaining: 1053
---------------- 25.19% Complete ----------------
# Documented functions: 516
# Undocumented remaining: 1048
------------------ Game Status ------------------
Balloons: 12/47, Keys: 1/4, Trophies: 1/5
T.T. Amulets: 1/4, Wizpig Amulets: 1/4
asm/math_util/coss.s
+1 -1
View File
@@ -1,4 +1,4 @@
glabel coss
glabel coss /* Official Name: mathCosInterp */
/* 07142C 8007082C 24844000 */ addiu $a0, $a0, 0x4000
glabel sins /* Official name: mathSinInterp */
/* 071430 80070830 00041440 */ sll $v0, $a0, 0x11
asm/math_util/f32_matrix_dot.s
+1
View File
@@ -1,3 +1,4 @@
/* Official name: mathMtxFastXFMF */
glabel f32_matrix_dot
/* 0702EC 8006F6EC C4A40000 */ lwc1 $f4, ($a1)
/* 0702F0 8006F6F0 C48A0000 */ lwc1 $f10, ($a0)
asm/math_util/f32_matrix_mult.s
+1
View File
@@ -1,3 +1,4 @@
/* Official name: mathMtxCatF */
glabel f32_matrix_mult
/* 070368 8006F768 27BDFFF8 */ addiu $sp, $sp, -8
/* 07036C 8006F76C F7A20000 */ sdc1 $f2, ($sp)
asm/math_util/f32_matrix_to_s16_matrix.s
+1
View File
@@ -1,3 +1,4 @@
/* Official Name: mathMtxF2L */
glabel f32_matrix_to_s16_matrix
/* 070470 8006F870 3C014780 */ li $at, 0x47800000 # 65536.000000
/* 070474 8006F874 44816000 */ mtc1 $at, $f12
asm/math_util/f32_vec3_apply_object_rotation.s
+1
View File
@@ -1,3 +1,4 @@
/* Official Name: mathOneFloatRPY */
glabel f32_vec3_apply_object_rotation
/* 070F20 80070320 27BDFFF8 */ addiu $sp, $sp, -8
/* 070F24 80070324 FFBF0000 */ sd $ra, ($sp)
asm/math_util/f32_vec3_apply_object_rotation2.s
+1
View File
@@ -1,3 +1,4 @@
/* Official Name: mathOneFloatYPR */
glabel f32_vec3_apply_object_rotation2
/* 070FD8 800703D8 27BDFFF8 */ addiu $sp, $sp, -8
/* 070FDC 800703DC FFBF0000 */ sd $ra, ($sp)
asm/math_util/f32_vec3_apply_object_rotation3.s
+1
View File
@@ -1,3 +1,4 @@
/* Official Name: mathOneFloatPY */
glabel f32_vec3_apply_object_rotation3
/* 071090 80070490 27BDFFF8 */ addiu $sp, $sp, -8
/* 071094 80070494 FFBF0000 */ sd $ra, ($sp)
asm/math_util/func_80070058.s
+55
View File
@@ -0,0 +1,55 @@
glabel func_80070058
/* 070C58 80070058 27BDFFF8 */ addiu $sp, $sp, -8
/* 070C5C 8007005C 3C013780 */ li $at, 0x37800000 # 0.000015
/* 070C60 80070060 FFBF0000 */ sd $ra, ($sp)
/* 070C64 80070064 00803825 */ move $a3, $a0
/* 070C68 80070068 44819000 */ mtc1 $at, $f18
/* 070C6C 8007006C 0C01C20C */ jal sins
/* 070C70 80070070 84A40000 */ lh $a0, ($a1)
/* 070C74 80070074 44820000 */ mtc1 $v0, $f0
/* 070C78 80070078 84A40000 */ lh $a0, ($a1)
/* 070C7C 8007007C 46800020 */ cvt.s.w $f0, $f0
/* 070C80 80070080 46120002 */ mul.s $f0, $f0, $f18
/* 070C84 80070084 0C01C20B */ jal coss
/* 070C88 80070088 00000000 */ nop
/* 070C8C 8007008C 44821000 */ mtc1 $v0, $f2
/* 070C90 80070090 84A40002 */ lh $a0, 2($a1)
/* 070C94 80070094 468010A0 */ cvt.s.w $f2, $f2
/* 070C98 80070098 46121082 */ mul.s $f2, $f2, $f18
/* 070C9C 8007009C 0C01C20C */ jal sins
/* 070CA0 800700A0 00000000 */ nop
/* 070CA4 800700A4 44822000 */ mtc1 $v0, $f4
/* 070CA8 800700A8 84A40002 */ lh $a0, 2($a1)
/* 070CAC 800700AC 46802120 */ cvt.s.w $f4, $f4
/* 070CB0 800700B0 46122102 */ mul.s $f4, $f4, $f18
/* 070CB4 800700B4 0C01C20B */ jal coss
/* 070CB8 800700B8 00000000 */ nop
/* 070CBC 800700BC 44823000 */ mtc1 $v0, $f6
/* 070CC0 800700C0 84A40004 */ lh $a0, 4($a1)
/* 070CC4 800700C4 468031A0 */ cvt.s.w $f6, $f6
/* 070CC8 800700C8 46123182 */ mul.s $f6, $f6, $f18
/* 070CCC 800700CC 0C01C20C */ jal sins
/* 070CD0 800700D0 00000000 */ nop
/* 070CD4 800700D4 44824000 */ mtc1 $v0, $f8
/* 070CD8 800700D8 84A40004 */ lh $a0, 4($a1)
/* 070CDC 800700DC 46804220 */ cvt.s.w $f8, $f8
/* 070CE0 800700E0 46124202 */ mul.s $f8, $f8, $f18
/* 070CE4 800700E4 0C01C20B */ jal coss
/* 070CE8 800700E8 00000000 */ nop
/* 070CEC 800700EC 44825000 */ mtc1 $v0, $f10
/* 070CF0 800700F0 3C013F80 */ li $at, 0x3F800000 # 1.000000
/* 070CF4 800700F4 ACE0000C */ sw $zero, 0xc($a3)
/* 070CF8 800700F8 468052A0 */ cvt.s.w $f10, $f10
/* 070CFC 800700FC ACE0001C */ sw $zero, 0x1c($a3)
/* 070D00 80070100 ACE0002C */ sw $zero, 0x2c($a3)
/* 070D04 80070104 46125282 */ mul.s $f10, $f10, $f18
/* 070D08 80070108 44819000 */ mtc1 $at, $f18
/* 070D0C 8007010C 46060302 */ mul.s $f12, $f0, $f6
/* 070D10 80070110 E4F2003C */ swc1 $f18, 0x3c($a3)
/* 070D14 80070114 DFBF0000 */ ld $ra, ($sp)
/* 070D18 80070118 27BD0008 */ addiu $sp, $sp, 8
/* 070D1C 8007011C 460A1382 */ mul.s $f14, $f2, $f10
/* 070D20 80070120 00000000 */ nop
/* 070D24 80070124 46080402 */ mul.s $f16, $f0, $f8
/* 070D28 80070128 03E00008 */ jr $ra
/* 070D2C 8007012C 00000000 */ nop
asm/math_util/object_transform_to_matrix_2.s
-56
View File
@@ -120,59 +120,3 @@ glabel object_transform_to_matrix_2
/* 070C4C 8007004C 27BD0008 */ addiu $sp, $sp, 8
/* 070C50 80070050 03E00008 */ jr $ra
/* 070C54 80070054 00000000 */ nop
/* 070C58 80070058 27BDFFF8 */ addiu $sp, $sp, -8
/* 070C5C 8007005C 3C013780 */ li $at, 0x37800000 # 0.000015
/* 070C60 80070060 FFBF0000 */ sd $ra, ($sp)
/* 070C64 80070064 00803825 */ move $a3, $a0
/* 070C68 80070068 44819000 */ mtc1 $at, $f18
/* 070C6C 8007006C 0C01C20C */ jal sins
/* 070C70 80070070 84A40000 */ lh $a0, ($a1)
/* 070C74 80070074 44820000 */ mtc1 $v0, $f0
/* 070C78 80070078 84A40000 */ lh $a0, ($a1)
/* 070C7C 8007007C 46800020 */ cvt.s.w $f0, $f0
/* 070C80 80070080 46120002 */ mul.s $f0, $f0, $f18
/* 070C84 80070084 0C01C20B */ jal coss
/* 070C88 80070088 00000000 */ nop
/* 070C8C 8007008C 44821000 */ mtc1 $v0, $f2
/* 070C90 80070090 84A40002 */ lh $a0, 2($a1)
/* 070C94 80070094 468010A0 */ cvt.s.w $f2, $f2
/* 070C98 80070098 46121082 */ mul.s $f2, $f2, $f18
/* 070C9C 8007009C 0C01C20C */ jal sins
/* 070CA0 800700A0 00000000 */ nop
/* 070CA4 800700A4 44822000 */ mtc1 $v0, $f4
/* 070CA8 800700A8 84A40002 */ lh $a0, 2($a1)
/* 070CAC 800700AC 46802120 */ cvt.s.w $f4, $f4
/* 070CB0 800700B0 46122102 */ mul.s $f4, $f4, $f18
/* 070CB4 800700B4 0C01C20B */ jal coss
/* 070CB8 800700B8 00000000 */ nop
/* 070CBC 800700BC 44823000 */ mtc1 $v0, $f6
/* 070CC0 800700C0 84A40004 */ lh $a0, 4($a1)
/* 070CC4 800700C4 468031A0 */ cvt.s.w $f6, $f6
/* 070CC8 800700C8 46123182 */ mul.s $f6, $f6, $f18
/* 070CCC 800700CC 0C01C20C */ jal sins
/* 070CD0 800700D0 00000000 */ nop
/* 070CD4 800700D4 44824000 */ mtc1 $v0, $f8
/* 070CD8 800700D8 84A40004 */ lh $a0, 4($a1)
/* 070CDC 800700DC 46804220 */ cvt.s.w $f8, $f8
/* 070CE0 800700E0 46124202 */ mul.s $f8, $f8, $f18
/* 070CE4 800700E4 0C01C20B */ jal coss
/* 070CE8 800700E8 00000000 */ nop
/* 070CEC 800700EC 44825000 */ mtc1 $v0, $f10
/* 070CF0 800700F0 3C013F80 */ li $at, 0x3F800000 # 1.000000
/* 070CF4 800700F4 ACE0000C */ sw $zero, 0xc($a3)
/* 070CF8 800700F8 468052A0 */ cvt.s.w $f10, $f10
/* 070CFC 800700FC ACE0001C */ sw $zero, 0x1c($a3)
/* 070D00 80070100 ACE0002C */ sw $zero, 0x2c($a3)
/* 070D04 80070104 46125282 */ mul.s $f10, $f10, $f18
/* 070D08 80070108 44819000 */ mtc1 $at, $f18
/* 070D0C 8007010C 46060302 */ mul.s $f12, $f0, $f6
/* 070D10 80070110 E4F2003C */ swc1 $f18, 0x3c($a3)
/* 070D14 80070114 DFBF0000 */ ld $ra, ($sp)
/* 070D18 80070118 27BD0008 */ addiu $sp, $sp, 8
/* 070D1C 8007011C 460A1382 */ mul.s $f14, $f2, $f10
/* 070D20 80070120 00000000 */ nop
/* 070D24 80070124 46080402 */ mul.s $f16, $f0, $f8
/* 070D28 80070128 03E00008 */ jr $ra
/* 070D2C 8007012C 00000000 */ nop
asm/math_util/s16_matrix_rotate.s
+1
View File
@@ -1,3 +1,4 @@
/* Official name: fastShortReflection */
glabel s16_matrix_rotate
/* 0705B8 8006F9B8 84880000 */ lh $t0, ($a0)
/* 0705BC 8006F9BC 84AB0000 */ lh $t3, ($a1)
asm/non_matchings/game_ui/func_800AA600.s
+1 -1
View File
@@ -594,7 +594,7 @@ glabel func_800AA600
/* 0ABAB4 800AAEB4 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0ABAB8 800AAEB8 02003025 */ move $a2, $s0
/* 0ABABC 800AAEBC 3C073F80 */ lui $a3, 0x3f80
/* 0ABAC0 800AAEC0 0C01A521 */ jal func_80069484
/* 0ABAC0 800AAEC0 0C01A521 */ jal camera_push_model_mtx
/* 0ABAC4 800AAEC4 E7B20010 */ swc1 $f18, 0x10($sp)
/* 0ABAC8 800AAEC8 3C098012 */ lui $t1, %hi(D_80126CF4) # $t1, 0x8012
/* 0ABACC 800AAECC 86190006 */ lh $t9, 6($s0)
asm/non_matchings/menu/func_8009CA60.s
+1 -1
View File
@@ -167,7 +167,7 @@ glabel func_8009CA60
/* 09D8E0 8009CCE0 AFA8002C */ sw $t0, 0x2c($sp)
/* 09D8E4 8009CCE4 02002025 */ move $a0, $s0
/* 09D8E8 8009CCE8 01B83021 */ addu $a2, $t5, $t8
/* 09D8EC 8009CCEC 0C01A521 */ jal func_80069484
/* 09D8EC 8009CCEC 0C01A521 */ jal camera_push_model_mtx
/* 09D8F0 8009CCF0 E7B00010 */ swc1 $f16, 0x10($sp)
/* 09D8F4 8009CCF4 3C0B800E */ lui $t3, %hi(gMenuImageStack) # $t3, 0x800e
/* 09D8F8 8009CCF8 256BF75C */ addiu $t3, %lo(gMenuImageStack) # addiu $t3, $t3, -0x8a4
asm/non_matchings/objects/func_800135B8.s
+3 -3
View File
@@ -39,7 +39,7 @@ glabel func_800135B8
/* 014230 80013630 01826821 */ addu $t5, $t4, $v0
/* 014234 80013634 AFAD0048 */ sw $t5, 0x48($sp)
/* 014238 80013638 8DC40078 */ lw $a0, 0x78($t6)
/* 01423C 8001363C 0C004B8A */ jal func_80012E28
/* 01423C 8001363C 0C004B8A */ jal object_do_player_tumble
/* 014240 80013640 AFA50028 */ sw $a1, 0x28($sp)
/* 014244 80013644 8FAF0078 */ lw $t7, 0x78($sp)
/* 014248 80013648 44802000 */ mtc1 $zero, $f4
@@ -50,12 +50,12 @@ glabel func_800135B8
/* 01425C 8001365C 24A5AE90 */ addiu $a1, %lo(gObjectCurrMatrix) # addiu $a1, $a1, -0x5170
/* 014260 80013660 02002025 */ move $a0, $s0
/* 014264 80013664 3C073F80 */ lui $a3, 0x3f80
/* 014268 80013668 0C01A521 */ jal func_80069484
/* 014268 80013668 0C01A521 */ jal camera_push_model_mtx
/* 01426C 8001366C E7A40010 */ swc1 $f4, 0x10($sp)
/* 014270 80013670 8FB80078 */ lw $t8, 0x78($sp)
/* 014274 80013674 00000000 */ nop
/* 014278 80013678 8F040078 */ lw $a0, 0x78($t8)
/* 01427C 8001367C 0C004BCC */ jal objUndoPlayerTumble
/* 01427C 8001367C 0C004BCC */ jal object_undo_player_tumble
/* 014280 80013680 00000000 */ nop
/* 014284 80013684 8FA30050 */ lw $v1, 0x50($sp)
/* 014288 80013688 00000000 */ nop
asm/non_matchings/objects/render_3d_model.s
-783
View File
File diff suppressed because it is too large Load Diff
asm/non_matchings/particles/func_800AF714.s
+2 -2
View File
@@ -15,7 +15,7 @@ glabel func_800AF714
/* 0B0348 800AF748 8C970074 */ lw $s7, 0x74($a0)
/* 0B034C 800AF74C 827E01D6 */ lb $fp, 0x1d6($s3)
/* 0B0350 800AF750 00809025 */ move $s2, $a0
/* 0B0354 800AF754 0C004B8A */ jal func_80012E28
/* 0B0354 800AF754 0C004B8A */ jal object_do_player_tumble
/* 0B0358 800AF758 00008025 */ move $s0, $zero
/* 0B035C 800AF75C 8E4E0040 */ lw $t6, 0x40($s2)
/* 0B0360 800AF760 24160002 */ li $s6, 2
@@ -347,7 +347,7 @@ glabel func_800AF714
/* 0B07FC 800AFBFC 1420FEE0 */ bnez $at, .L800AF780
/* 0B0800 800AFC00 01A0B825 */ move $s7, $t5
.L800AFC04:
/* 0B0804 800AFC04 0C004BCC */ jal objUndoPlayerTumble
/* 0B0804 800AFC04 0C004BCC */ jal object_undo_player_tumble
/* 0B0808 800AFC08 02402025 */ move $a0, $s2
/* 0B080C 800AFC0C 8FBF003C */ lw $ra, 0x3c($sp)
/* 0B0810 800AFC10 8FB00018 */ lw $s0, 0x18($sp)
asm/non_matchings/particles/func_800B3740.s
+1 -1
View File
@@ -129,7 +129,7 @@ glabel func_800B3740
/* 0B4524 800B3924 AFA30030 */ sw $v1, 0x30($sp)
/* 0B4528 800B3928 AFAA0038 */ sw $t2, 0x38($sp)
/* 0B452C 800B392C AFAB003C */ sw $t3, 0x3c($sp)
/* 0B4530 800B3930 0C01A521 */ jal func_80069484
/* 0B4530 800B3930 0C01A521 */ jal camera_push_model_mtx
/* 0B4534 800B3934 E7A40010 */ swc1 $f4, 0x10($sp)
/* 0B4538 800B3938 8FA30030 */ lw $v1, 0x30($sp)
/* 0B453C 800B393C 86270018 */ lh $a3, 0x18($s1)
asm/non_matchings/textures_sprites/func_8007C660.s
-139
View File
@@ -1,139 +0,0 @@
# Unused
glabel func_8007C660
/* 07D260 8007C660 27BDFFC0 */ addiu $sp, $sp, -0x40
/* 07D264 8007C664 308F8000 */ andi $t7, $a0, 0x8000
/* 07D268 8007C668 AFBF003C */ sw $ra, 0x3c($sp)
/* 07D26C 8007C66C AFBE0038 */ sw $fp, 0x38($sp)
/* 07D270 8007C670 AFB70034 */ sw $s7, 0x34($sp)
/* 07D274 8007C674 AFB60030 */ sw $s6, 0x30($sp)
/* 07D278 8007C678 AFB5002C */ sw $s5, 0x2c($sp)
/* 07D27C 8007C67C AFB40028 */ sw $s4, 0x28($sp)
/* 07D280 8007C680 AFB30024 */ sw $s3, 0x24($sp)
/* 07D284 8007C684 AFB20020 */ sw $s2, 0x20($sp)
/* 07D288 8007C688 AFB1001C */ sw $s1, 0x1c($sp)
/* 07D28C 8007C68C AFB00018 */ sw $s0, 0x18($sp)
/* 07D290 8007C690 11E00003 */ beqz $t7, .L8007C6A0
/* 07D294 8007C694 AFA40040 */ sw $a0, 0x40($sp)
/* 07D298 8007C698 10000065 */ b .L8007C830
/* 07D29C 8007C69C 00001025 */ move $v0, $zero
.L8007C6A0:
/* 07D2A0 8007C6A0 3C138012 */ lui $s3, %hi(D_80126370) # $s3, 0x8012
/* 07D2A4 8007C6A4 26736370 */ addiu $s3, %lo(D_80126370) # addiu $s3, $s3, 0x6370
/* 07D2A8 8007C6A8 8E780000 */ lw $t8, ($s3)
/* 07D2AC 8007C6AC 3C108012 */ lui $s0, %hi(gTextureAssetID) # $s0, 0x8012
/* 07D2B0 8007C6B0 17000059 */ bnez $t8, .L8007C818
/* 07D2B4 8007C6B4 26106338 */ addiu $s0, %lo(gTextureAssetID) # addiu $s0, $s0, 0x6338
/* 07D2B8 8007C6B8 8E040000 */ lw $a0, ($s0)
/* 07D2BC 8007C6BC 3C05FF00 */ lui $a1, (0xFF00FFFF >> 16) # lui $a1, 0xff00
/* 07D2C0 8007C6C0 0C01C327 */ jal allocate_from_main_pool_safe
/* 07D2C4 8007C6C4 34A5FFFF */ ori $a1, (0xFF00FFFF & 0xFFFF) # ori $a1, $a1, 0xffff
/* 07D2C8 8007C6C8 8E190000 */ lw $t9, ($s0)
/* 07D2CC 8007C6CC AE620000 */ sw $v0, ($s3)
/* 07D2D0 8007C6D0 1B20000B */ blez $t9, .L8007C700
/* 07D2D4 8007C6D4 0000A025 */ move $s4, $zero
.L8007C6D8:
/* 07D2D8 8007C6D8 8E680000 */ lw $t0, ($s3)
/* 07D2DC 8007C6DC 00000000 */ nop
/* 07D2E0 8007C6E0 01144821 */ addu $t1, $t0, $s4
/* 07D2E4 8007C6E4 A1200000 */ sb $zero, ($t1)
/* 07D2E8 8007C6E8 8E0A0000 */ lw $t2, ($s0)
/* 07D2EC 8007C6EC 26940001 */ addiu $s4, $s4, 1
/* 07D2F0 8007C6F0 028A082A */ slt $at, $s4, $t2
/* 07D2F4 8007C6F4 1420FFF8 */ bnez $at, .L8007C6D8
/* 07D2F8 8007C6F8 00000000 */ nop
/* 07D2FC 8007C6FC 0000A025 */ move $s4, $zero
.L8007C700:
/* 07D300 8007C700 3C1E8012 */ lui $fp, %hi(D_80126354) # $fp, 0x8012
/* 07D304 8007C704 27DE6354 */ addiu $fp, %lo(D_80126354) # addiu $fp, $fp, 0x6354
/* 07D308 8007C708 8FCB0000 */ lw $t3, ($fp)
/* 07D30C 8007C70C 0000A825 */ move $s5, $zero
/* 07D310 8007C710 19600041 */ blez $t3, .L8007C818
/* 07D314 8007C714 3C178012 */ lui $s7, %hi(gSpriteOffsetTable) # $s7, 0x8012
/* 07D318 8007C718 3C168012 */ lui $s6, %hi(gCurrentSprite) # $s6, 0x8012
/* 07D31C 8007C71C 26D66350 */ addiu $s6, %lo(gCurrentSprite) # addiu $s6, $s6, 0x6350
/* 07D320 8007C720 26F76348 */ addiu $s7, %lo(gSpriteOffsetTable) # addiu $s7, $s7, 0x6348
/* 07D324 8007C724 24120001 */ li $s2, 1
.L8007C728:
/* 07D328 8007C728 8EEC0000 */ lw $t4, ($s7)
/* 07D32C 8007C72C 8ED10000 */ lw $s1, ($s6)
/* 07D330 8007C730 01951021 */ addu $v0, $t4, $s5
/* 07D334 8007C734 8C460000 */ lw $a2, ($v0)
/* 07D338 8007C738 8C4D0004 */ lw $t5, 4($v0)
/* 07D33C 8007C73C 2404000C */ li $a0, 12
/* 07D340 8007C740 00008025 */ move $s0, $zero
/* 07D344 8007C744 02202825 */ move $a1, $s1
/* 07D348 8007C748 0C01DB9A */ jal load_asset_to_address
/* 07D34C 8007C74C 01A63823 */ subu $a3, $t5, $a2
/* 07D350 8007C750 862E0002 */ lh $t6, 2($s1)
/* 07D354 8007C754 00000000 */ nop
/* 07D358 8007C758 022E7821 */ addu $t7, $s1, $t6
/* 07D35C 8007C75C 91E3000C */ lbu $v1, 0xc($t7)
/* 07D360 8007C760 00000000 */ nop
/* 07D364 8007C764 18600027 */ blez $v1, .L8007C804
/* 07D368 8007C768 30640003 */ andi $a0, $v1, 3
/* 07D36C 8007C76C 1080000B */ beqz $a0, .L8007C79C
/* 07D370 8007C770 00801025 */ move $v0, $a0
.L8007C774:
/* 07D374 8007C774 8E780000 */ lw $t8, ($s3)
/* 07D378 8007C778 86390000 */ lh $t9, ($s1)
/* 07D37C 8007C77C 00000000 */ nop
/* 07D380 8007C780 03194021 */ addu $t0, $t8, $t9
/* 07D384 8007C784 01104821 */ addu $t1, $t0, $s0
/* 07D388 8007C788 26100001 */ addiu $s0, $s0, 1
/* 07D38C 8007C78C 1450FFF9 */ bne $v0, $s0, .L8007C774
/* 07D390 8007C790 A1320000 */ sb $s2, ($t1)
/* 07D394 8007C794 1203001B */ beq $s0, $v1, .L8007C804
/* 07D398 8007C798 00000000 */ nop
.L8007C79C:
/* 07D39C 8007C79C 8E6A0000 */ lw $t2, ($s3)
/* 07D3A0 8007C7A0 862B0000 */ lh $t3, ($s1)
/* 07D3A4 8007C7A4 00000000 */ nop
/* 07D3A8 8007C7A8 014B6021 */ addu $t4, $t2, $t3
/* 07D3AC 8007C7AC 01906821 */ addu $t5, $t4, $s0
/* 07D3B0 8007C7B0 A1B20000 */ sb $s2, ($t5)
/* 07D3B4 8007C7B4 862F0000 */ lh $t7, ($s1)
/* 07D3B8 8007C7B8 8E6E0000 */ lw $t6, ($s3)
/* 07D3BC 8007C7BC 00000000 */ nop
/* 07D3C0 8007C7C0 01CFC021 */ addu $t8, $t6, $t7
/* 07D3C4 8007C7C4 0310C821 */ addu $t9, $t8, $s0
/* 07D3C8 8007C7C8 A3320001 */ sb $s2, 1($t9)
/* 07D3CC 8007C7CC 86290000 */ lh $t1, ($s1)
/* 07D3D0 8007C7D0 8E680000 */ lw $t0, ($s3)
/* 07D3D4 8007C7D4 00000000 */ nop
/* 07D3D8 8007C7D8 01095021 */ addu $t2, $t0, $t1
/* 07D3DC 8007C7DC 01505821 */ addu $t3, $t2, $s0
/* 07D3E0 8007C7E0 A1720002 */ sb $s2, 2($t3)
/* 07D3E4 8007C7E4 862D0000 */ lh $t5, ($s1)
/* 07D3E8 8007C7E8 8E6C0000 */ lw $t4, ($s3)
/* 07D3EC 8007C7EC 00000000 */ nop
/* 07D3F0 8007C7F0 018D7021 */ addu $t6, $t4, $t5
/* 07D3F4 8007C7F4 01D07821 */ addu $t7, $t6, $s0
/* 07D3F8 8007C7F8 26100004 */ addiu $s0, $s0, 4
/* 07D3FC 8007C7FC 1603FFE7 */ bne $s0, $v1, .L8007C79C
/* 07D400 8007C800 A1F20003 */ sb $s2, 3($t7)
.L8007C804:
/* 07D404 8007C804 8FD80000 */ lw $t8, ($fp)
/* 07D408 8007C808 26940001 */ addiu $s4, $s4, 1
/* 07D40C 8007C80C 0298082A */ slt $at, $s4, $t8
/* 07D410 8007C810 1420FFC5 */ bnez $at, .L8007C728
/* 07D414 8007C814 26B50004 */ addiu $s5, $s5, 4
.L8007C818:
/* 07D418 8007C818 8E790000 */ lw $t9, ($s3)
/* 07D41C 8007C81C 8FA80040 */ lw $t0, 0x40($sp)
/* 07D420 8007C820 00000000 */ nop
/* 07D424 8007C824 03284821 */ addu $t1, $t9, $t0
/* 07D428 8007C828 91220000 */ lbu $v0, ($t1)
/* 07D42C 8007C82C 00000000 */ nop
.L8007C830:
/* 07D430 8007C830 8FBF003C */ lw $ra, 0x3c($sp)
/* 07D434 8007C834 8FB00018 */ lw $s0, 0x18($sp)
/* 07D438 8007C838 8FB1001C */ lw $s1, 0x1c($sp)
/* 07D43C 8007C83C 8FB20020 */ lw $s2, 0x20($sp)
/* 07D440 8007C840 8FB30024 */ lw $s3, 0x24($sp)
/* 07D444 8007C844 8FB40028 */ lw $s4, 0x28($sp)
/* 07D448 8007C848 8FB5002C */ lw $s5, 0x2c($sp)
/* 07D44C 8007C84C 8FB60030 */ lw $s6, 0x30($sp)
/* 07D450 8007C850 8FB70034 */ lw $s7, 0x34($sp)
/* 07D454 8007C854 8FBE0038 */ lw $fp, 0x38($sp)
/* 07D458 8007C858 03E00008 */ jr $ra
/* 07D45C 8007C85C 27BD0040 */ addiu $sp, $sp, 0x40
asm/non_matchings/waves/func_800BA8E4.s
+2 -2
View File
@@ -373,7 +373,7 @@ glabel func_800BA8E4
/* 0BBA70 800BAE70 24A59FC4 */ addiu $a1, %lo(D_80129FC4) # addiu $a1, $a1, -0x603c
/* 0BBA74 800BAE74 02202025 */ move $a0, $s1
/* 0BBA78 800BAE78 27A600E4 */ addiu $a2, $sp, 0xe4
/* 0BBA7C 800BAE7C 0C01A521 */ jal func_80069484
/* 0BBA7C 800BAE7C 0C01A521 */ jal camera_push_model_mtx
/* 0BBA80 800BAE80 E7B60010 */ swc1 $f22, 0x10($sp)
/* 0BBA84 800BAE84 8FA50104 */ lw $a1, 0x104($sp)
/* 0BBA88 800BAE88 3C1F8013 */ lui $ra, %hi(D_80129FC8) # $ra, 0x8013
@@ -527,7 +527,7 @@ glabel func_800BA8E4
/* 0BBCC8 800BB0C8 AFB00074 */ sw $s0, 0x74($sp)
/* 0BBCCC 800BB0CC 4407C000 */ mfc1 $a3, $f24
/* 0BBCD0 800BB0D0 00008025 */ move $s0, $zero
/* 0BBCD4 800BB0D4 0C01A521 */ jal func_80069484
/* 0BBCD4 800BB0D4 0C01A521 */ jal camera_push_model_mtx
/* 0BBCD8 800BB0D8 E7B60010 */ swc1 $f22, 0x10($sp)
/* 0BBCDC 800BB0DC 3C1F8013 */ lui $ra, %hi(D_80129FC8) # $ra, 0x8013
/* 0BBCE0 800BB0E0 8FAE0104 */ lw $t6, 0x104($sp)
include/enums.h
+3 -3
View File
@@ -108,9 +108,9 @@ typedef enum MiscAsset {
MISC_ASSET_UNK02,
MISC_ASSET_UNK03,
MISC_ASSET_UNK04,
MISC_ASSET_UNK05,
MISC_ASSET_UNK06,
MISC_ASSET_UNK07,
MISC_ASSET_UNK05, //Tricky boss
MISC_ASSET_UNK06, //Bluey boss
MISC_ASSET_UNK07, //Smokey boss
MISC_ASSET_UNK08,
MISC_RACER_WEIGHT,
MISC_RACER_HANDLING,

Some files were not shown because too many files have changed in this diff Show More