New Match 52% + A LOT OF RENAMES (#397)

* Remove separate RODATA declarations for debug strings.

* Migrate thread1 stack

* func_80031F88 WIP

* Match func_80031F88

* Rename some funcs using JFG as basis.

* Rename unknown_032760 to lights, and move asm files around.

* More names, and a slightly better score for setup_lights

* Couple of possible names.

* Support expansion pak without resorting to fake matches.

* Rename and move bcmp to a libultra folder and leave it as asm.

* Rename unknown_0255E0 to tracks

* Rename unknown_078050 to rcp.

* Update score
This commit is contained in:
Ryan Myers
2023-06-22 15:13:36 -04:00
committed by GitHub
parent 20cd6dc517
commit 72e55efcb4
80 changed files with 283 additions and 346 deletions
+11 -11
View File
@@ -5,11 +5,11 @@ This repo contains a work-in-progress decompilation of Diddy Kong Racing for the
Currently, only the US 1.0 version of the game is supported. US 1.1, EU 1.0, EU 1.1, and JP are not supported at this time.
<!-- README_SCORE_SUMMARY_BEGIN -->
As of May 19, 2023, this is our current score:
As of June 22, 2023, this is our current score:
&emsp;&emsp;&emsp;&emsp;Decomp progress: 51.99%
&emsp;&emsp;&emsp;&emsp;Decomp progress: 52.10%
&emsp;&emsp;&emsp;&emsp;Documentation progress: 26.52%
&emsp;&emsp;&emsp;&emsp;Documentation progress: 26.72%
<!-- README_SCORE_SUMMARY_END -->
---
@@ -128,25 +128,25 @@ s32 is_drumstick_unlocked(void) {
```
<!-- README_SCORE_BEGIN -->
As of April 28, 2023, this is our current score:
As of June 22, 2023, this is our current score:
```
=================================================
ADVENTURE ONE (ASM -> C Decompilation)
---------------- 51.99% Complete ----------------
# Decompiled functions: 1507
# GLOBAL_ASM remaining: 325
---------------- 52.10% Complete ----------------
# Decompiled functions: 1508
# GLOBAL_ASM remaining: 323
# NON_MATCHING functions: 12
# NON_EQUIVALENT WIP functions: 65
------------------ Game Status ------------------
Balloons: 26/47, Keys: 3/4, Trophies: 2/5
T.T. Amulets: 2/4, Wizpig Amulets: 2/4
-------------------------------------------------
We are racing the octopus boss Bubbler. (Lap 1/3)
We are racing the octopus boss Bubbler. (Lap 2/3)
=================================================
ADVENTURE TWO (Cleanup & Documentation)
---------------- 26.52% Complete ----------------
# Documented functions: 568
# Undocumented remaining: 996
---------------- 26.72% Complete ----------------
# Documented functions: 573
# Undocumented remaining: 990
------------------ Game Status ------------------
Balloons: 13/47, Keys: 1/4, Trophies: 1/5
T.T. Amulets: 1/4, Wizpig Amulets: 1/4
@@ -240,7 +240,7 @@ glabel func_80032C7C
/* 033C18 80033018 24010002 */ li $at, 2
/* 033C1C 8003301C 15810006 */ bne $t4, $at, .L80033038
/* 033C20 80033020 02002025 */ move $a0, $s0
/* 033C24 80033024 0C00CF02 */ jal func_80033C08
/* 033C24 80033024 0C00CF02 */ jal light_direction_calc
/* 033C28 80033028 AFA20068 */ sw $v0, 0x68($sp)
/* 033C2C 8003302C 8FA20068 */ lw $v0, 0x68($sp)
/* 033C30 80033030 10000002 */ b .L8003303C
@@ -252,7 +252,7 @@ glabel func_80032C7C
/* 033C40 80033040 02002025 */ move $a0, $s0
/* 033C44 80033044 4500008C */ bc1f .L80033278
/* 033C48 80033048 00000000 */ nop
/* 033C4C 8003304C 0C00CE85 */ jal func_80033A14
/* 033C4C 8003304C 0C00CE85 */ jal light_distance_calc
/* 033C50 80033050 AFA20068 */ sw $v0, 0x68($sp)
/* 033C54 80033054 4600A502 */ mul.s $f20, $f20, $f0
/* 033C58 80033058 8FA20068 */ lw $v0, 0x68($sp)
@@ -1,7 +1,7 @@
glabel func_80031BB8
glabel setup_lights
/* 0327B8 80031BB8 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 0327BC 80031BBC AFBF0014 */ sw $ra, 0x14($sp)
/* 0327C0 80031BC0 0C00C6D8 */ jal func_80031B60
/* 0327C0 80031BC0 0C00C6D8 */ jal free_lights
/* 0327C4 80031BC4 AFA40018 */ sw $a0, 0x18($sp)
/* 0327C8 80031BC8 8FAE0018 */ lw $t6, 0x18($sp)
/* 0327CC 80031BCC 3C06800E */ lui $a2, %hi(D_800DC958) # $a2, 0x800e
+1 -1
View File
@@ -822,7 +822,7 @@ glabel L8000EDE0
/* 010200 8000F600 00000000 */ nop
/* 010204 8000F604 19C00003 */ blez $t6, .L8000F614
/* 010208 8000F608 00000000 */ nop
/* 01020C 8000F60C 0C003DD6 */ jal lightSetupLightSources
/* 01020C 8000F60C 0C003DD6 */ jal light_setup_light_sources
/* 010210 8000F610 02402025 */ move $a0, $s2
.L8000F614:
/* 010214 8000F614 0C01867D */ jal func_800619F4

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