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

Renamed some functions & variables in unknown_00BC20

Browse Source
This commit is contained in:
David Benepe
2021-06-24 17:07:38 -05:00
parent 714f39b36e
commit 5fa33084d6
160 changed files with 572 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+8 -8
View File
@@ -109,13 +109,13 @@ s32 is_drumstick_unlocked(void) {
}
```
As of June 13th 2021, this is our current score:
As of June 24th 2021, this is our current score:
```
=======================================================
=======================================================
ADVENTURE ONE (ASM -> C Decompilation)
------------------- 9.15% Complete -------------------
# Decompiled functions: 677
# GLOBAL_ASM remaining: 1076
------------------- 9.47% Complete -------------------
# Decompiled functions: 699
# GLOBAL_ASM remaining: 1061
--------------------- Game Status ---------------------
Balloons: 6/47, Keys: 1/4, Trophies: 0/5
T.T. Amulets: 0/4, Wizpig Amulets: 0/4
@@ -123,9 +123,9 @@ As of June 13th 2021, this is our current score:
We are racing in Jungle Falls. (Lap 1/3)
=======================================================
ADVENTURE TWO (Cleanup & Documentation)
------------------- 0.01% Complete -------------------
# Documented functions: 4
# Undocumented remaining: 1749
------------------- 0.49% Complete -------------------
# Documented functions: 42
# Undocumented remaining: 1718
--------------------- Game Status ---------------------
Balloons: 0/47, Keys: 0/4, Trophies: 0/5
T.T. Amulets: 0/4, Wizpig Amulets: 0/4
asm/non_matchings/menu/func_80081218.s
+1 -1
View File
@@ -76,7 +76,7 @@ glabel func_80081218
/* 081F40 80081340 8DAE0004 */ lw $t6, 4($t5)
/* 081F44 80081344 00000000 */ nop
/* 081F48 80081348 01C65821 */ addu $t3, $t6, $a2
/* 081F4C 8008134C 0C0078A7 */ jal func_8001E29C
/* 081F4C 8008134C 0C0078A7 */ jal get_misc_asset
/* 081F50 80081350 ADAB0000 */ sw $t3, ($t5)
/* 081F54 80081354 3C038012 */ lui $v1, %hi(gCheatsAssetData) # $v1, 0x8012
/* 081F58 80081358 24636C30 */ addiu $v1, %lo(gCheatsAssetData) # addiu $v1, $v1, 0x6c30
asm/non_matchings/menu/func_8008FF1C.s
+1 -1
View File
@@ -13,7 +13,7 @@ glabel func_8008FF1C
/* 090B48 8008FF48 0C01BAA4 */ jal get_settings
/* 090B4C 8008FF4C AFA40080 */ sw $a0, 0x80($sp)
/* 090B50 8008FF50 AFA20058 */ sw $v0, 0x58($sp)
/* 090B54 8008FF54 0C0078A7 */ jal func_8001E29C
/* 090B54 8008FF54 0C0078A7 */ jal get_misc_asset
/* 090B58 8008FF58 2404001A */ li $a0, 26
/* 090B5C 8008FF5C 3C03800E */ lui $v1, %hi(gMenuDelay) # $v1, 0x800e
/* 090B60 8008FF60 8C63F47C */ lw $v1, %lo(gMenuDelay)($v1)
asm/non_matchings/menu/func_80095728.s
+2 -2
View File
@@ -1010,7 +1010,7 @@ glabel L800964DC
/* 097190 80096590 24010009 */ li $at, 9
/* 097194 80096594 1441000D */ bne $v0, $at, .L800965CC
/* 097198 80096598 00000000 */ nop
/* 09719C 8009659C 0C0078A7 */ jal func_8001E29C
/* 09719C 8009659C 0C0078A7 */ jal get_misc_asset
/* 0971A0 800965A0 24040019 */ li $a0, 25
/* 0971A4 800965A4 3C058012 */ lui $a1, %hi(D_80126C28) # $a1, 0x8012
/* 0971A8 800965A8 80A56C28 */ lb $a1, %lo(D_80126C28)($a1)
@@ -1023,7 +1023,7 @@ glabel L800964DC
/* 0971C4 800965C4 1000000C */ b .L800965F8
/* 0971C8 800965C8 2419000D */ li $t9, 13
.L800965CC:
/* 0971CC 800965CC 0C0078A7 */ jal func_8001E29C
/* 0971CC 800965CC 0C0078A7 */ jal get_misc_asset
/* 0971D0 800965D0 24040019 */ li $a0, 25
/* 0971D4 800965D4 3C058012 */ lui $a1, %hi(D_80126C28) # $a1, 0x8012
/* 0971D8 800965D8 80A56C28 */ lb $a1, %lo(D_80126C28)($a1)
asm/non_matchings/menu/func_8009963C.s
+1 -1
View File
@@ -4,7 +4,7 @@ glabel func_8009963C
/* 09A244 80099644 252964D4 */ addiu $t1, %lo(D_801264D4) # addiu $t1, $t1, 0x64d4
/* 09A248 80099648 AFBF0014 */ sw $ra, 0x14($sp)
/* 09A24C 8009964C AD200000 */ sw $zero, ($t1)
/* 09A250 80099650 0C0078A7 */ jal func_8001E29C
/* 09A250 80099650 0C0078A7 */ jal get_misc_asset
/* 09A254 80099654 2404001C */ li $a0, 28
/* 09A258 80099658 3C098012 */ lui $t1, %hi(D_801264D4) # $t1, 0x8012
/* 09A25C 8009965C 3C078012 */ lui $a3, %hi(D_801264DC) # $a3, 0x8012
asm/non_matchings/menu/menu_credits_loop.s
+2 -2
View File
@@ -19,10 +19,10 @@ glabel menu_credits_loop
/* 09BF5C 8009B35C E7B50028 */ swc1 $f21, 0x28($sp)
/* 09BF60 8009B360 E7B4002C */ swc1 $f20, 0x2c($sp)
/* 09BF64 8009B364 AFA00068 */ sw $zero, 0x68($sp)
/* 09BF68 8009B368 0C0078A7 */ jal func_8001E29C
/* 09BF68 8009B368 0C0078A7 */ jal get_misc_asset
/* 09BF6C 8009B36C 2404001C */ li $a0, 28
/* 09BF70 8009B370 AFA2005C */ sw $v0, 0x5c($sp)
/* 09BF74 8009B374 0C0078A7 */ jal func_8001E29C
/* 09BF74 8009B374 0C0078A7 */ jal get_misc_asset
/* 09BF78 8009B378 24040045 */ li $a0, 69
/* 09BF7C 8009B37C 0C031CFC */ jal func_800C73F0
/* 09BF80 8009B380 AFA20060 */ sw $v0, 0x60($sp)
asm/non_matchings/menu/menu_file_select_loop.s
+1 -1
View File
@@ -346,7 +346,7 @@ glabel menu_file_select_loop
/* 08EF80 8008E380 35CF0004 */ ori $t7, $t6, 4
/* 08EF84 8008E384 AC4F0010 */ sw $t7, 0x10($v0)
.L8008E388:
/* 08EF88 8008E388 0C0078A7 */ jal func_8001E29C
/* 08EF88 8008E388 0C0078A7 */ jal get_misc_asset
/* 08EF8C 8008E38C 24040019 */ li $a0, 25
/* 08EF90 8008E390 3C06800E */ lui $a2, %hi(gNumberOfActivePlayers) # $a2, 0x800e
/* 08EF94 8008E394 8CC6F4BC */ lw $a2, %lo(gNumberOfActivePlayers)($a2)
asm/non_matchings/menu/menu_title_screen_init.s
+1 -1
View File
@@ -111,7 +111,7 @@ glabel menu_title_screen_init
/* 0842E4 800836E4 00002025 */ move $a0, $zero
/* 0842E8 800836E8 3C018012 */ lui $at, %hi(D_80126864) # $at, 0x8012
/* 0842EC 800836EC AC206864 */ sw $zero, %lo(D_80126864)($at)
/* 0842F0 800836F0 0C0078A7 */ jal func_8001E29C
/* 0842F0 800836F0 0C0078A7 */ jal get_misc_asset
/* 0842F4 800836F4 24040042 */ li $a0, 66
/* 0842F8 800836F8 3C048012 */ lui $a0, %hi(D_80126874) # $a0, 0x8012
/* 0842FC 800836FC 24846874 */ addiu $a0, %lo(D_80126874) # addiu $a0, $a0, 0x6874
asm/non_matchings/menu/menu_track_select_init.s
+1 -1
View File
@@ -18,7 +18,7 @@ glabel menu_track_select_init
/* 08F3E0 8008E7E0 27A4007C */ addiu $a0, $sp, 0x7c
/* 08F3E4 8008E7E4 0C01AC89 */ jal func_8006B224
/* 08F3E8 8008E7E8 27A50078 */ addiu $a1, $sp, 0x78
/* 08F3EC 8008E7EC 0C0078A7 */ jal func_8001E29C
/* 08F3EC 8008E7EC 0C0078A7 */ jal get_misc_asset
/* 08F3F0 8008E7F0 2404001A */ li $a0, 26
/* 08F3F4 8008E7F4 3C03800E */ lui $v1, %hi(D_800DF488) # $v1, 0x800e
/* 08F3F8 8008E7F8 2463F488 */ addiu $v1, %lo(D_800DF488) # addiu $v1, $v1, -0xb78
asm/non_matchings/menu/menu_trophy_race_rankings_init.s
+1 -1
View File
@@ -4,7 +4,7 @@ glabel menu_trophy_race_rankings_init
/* 09962C 80098A2C 0C01BAA4 */ jal get_settings
/* 099630 80098A30 00000000 */ nop
/* 099634 80098A34 2404001A */ li $a0, 26
/* 099638 80098A38 0C0078A7 */ jal func_8001E29C
/* 099638 80098A38 0C0078A7 */ jal get_misc_asset
/* 09963C 80098A3C AFA20040 */ sw $v0, 0x40($sp)
/* 099640 80098A40 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 099644 80098A44 AC2063E0 */ sw $zero, %lo(D_801263E0)($at)
asm/non_matchings/menu/menu_trophy_race_rankings_loop.s
+1 -1
View File
@@ -393,7 +393,7 @@ glabel menu_trophy_race_rankings_loop
.L80099588:
/* 09A188 80099588 10200015 */ beqz $at, .L800995E0
/* 09A18C 8009958C 2404001F */ li $a0, 31
/* 09A190 80099590 0C0078A7 */ jal func_8001E29C
/* 09A190 80099590 0C0078A7 */ jal get_misc_asset
/* 09A194 80099594 AFAC0034 */ sw $t4, 0x34($sp)
/* 09A198 80099598 3C0F800E */ lui $t7, %hi(gTrophyRaceWorldId) # $t7, 0x800e
/* 09A19C 8009959C 8DEF0FE8 */ lw $t7, %lo(gTrophyRaceWorldId)($t7)
asm/non_matchings/menu/menu_trophy_race_round_init.s
+1 -1
View File
@@ -7,7 +7,7 @@ glabel menu_trophy_race_round_init
/* 098E80 80098280 0C01BAA4 */ jal get_settings
/* 098E84 80098284 AFB00014 */ sw $s0, 0x14($sp)
/* 098E88 80098288 00408825 */ move $s1, $v0
/* 098E8C 8009828C 0C0078A7 */ jal func_8001E29C
/* 098E8C 8009828C 0C0078A7 */ jal get_misc_asset
/* 098E90 80098290 2404001A */ li $a0, 26
/* 098E94 80098294 3C03800E */ lui $v1, %hi(D_800E0FEC) # $v1, 0x800e
/* 098E98 80098298 8C630FEC */ lw $v1, %lo(D_800E0FEC)($v1)
asm/non_matchings/menu/menu_trophy_race_round_loop.s
+1 -1
View File
@@ -2,7 +2,7 @@ glabel menu_trophy_race_round_loop
/* 09919C 8009859C 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 0991A0 800985A0 AFBF0014 */ sw $ra, 0x14($sp)
/* 0991A4 800985A4 AFA40020 */ sw $a0, 0x20($sp)
/* 0991A8 800985A8 0C0078A7 */ jal func_8001E29C
/* 0991A8 800985A8 0C0078A7 */ jal get_misc_asset
/* 0991AC 800985AC 2404001A */ li $a0, 26
/* 0991B0 800985B0 3C07800E */ lui $a3, %hi(D_800E0980) # $a3, 0x800e
/* 0991B4 800985B4 24E70980 */ addiu $a3, %lo(D_800E0980) # addiu $a3, $a3, 0x980
asm/non_matchings/unknown_00BC20/func_8000C2D8.s → asm/non_matchings/unknown_00BC20/decrypt_magic_codes.s
+1 -1
View File
@@ -1,4 +1,4 @@
glabel func_8000C2D8
glabel decrypt_magic_codes
/* 00CED8 8000C2D8 00053083 */ sra $a2, $a1, 2
/* 00CEDC 8000C2DC 27BDFFF0 */ addiu $sp, $sp, -0x10
/* 00CEE0 8000C2E0 00801025 */ move $v0, $a0
asm/non_matchings/unknown_00BC20/func_8000B020.s
+1 -1
View File
@@ -43,7 +43,7 @@ glabel func_8000B020
/* 00BCC4 8000B0C4 AC20B004 */ sw $zero, %lo(D_8011B004)($at)
/* 00BCC8 8000B0C8 3C018012 */ lui $at, %hi(D_8011B008) # $at, 0x8012
/* 00BCCC 8000B0CC AC20B008 */ sw $zero, %lo(D_8011B008)($at)
/* 00BCD0 8000B0D0 0C0078A7 */ jal func_8001E29C
/* 00BCD0 8000B0D0 0C0078A7 */ jal get_misc_asset
/* 00BCD4 8000B0D4 24040014 */ li $a0, 20
/* 00BCD8 8000B0D8 3C118012 */ lui $s1, %hi(D_8011B020) # $s1, 0x8012
/* 00BCDC 8000B0DC 3C138012 */ lui $s3, %hi(D_8011B068) # $s3, 0x8012
asm/non_matchings/unknown_00BC20/func_8000B290.s
+4 -4
View File
@@ -17,7 +17,7 @@ glabel func_8000B290
/* 00BECC 8000B2CC AC400000 */ sw $zero, ($v0)
/* 00BED0 8000B2D0 AC400004 */ sw $zero, 4($v0)
.L8000B2D4:
/* 00BED4 8000B2D4 0C0078A7 */ jal func_8001E29C
/* 00BED4 8000B2D4 0C0078A7 */ jal get_misc_asset
/* 00BED8 8000B2D8 24040014 */ li $a0, 20
/* 00BEDC 8000B2DC 00008825 */ move $s1, $zero
/* 00BEE0 8000B2E0 00408025 */ move $s0, $v0
@@ -48,7 +48,7 @@ glabel func_8000B290
/* 00BF38 8000B338 00000000 */ nop
/* 00BF3C 8000B33C 10800003 */ beqz $a0, .L8000B34C
/* 00BF40 8000B340 00000000 */ nop
/* 00BF44 8000B344 0C003FEE */ jal particlePtrList_addObject
/* 00BF44 8000B344 0C003FEE */ jal gParticlePtrList_addObject
/* 00BF48 8000B348 00000000 */ nop
.L8000B34C:
/* 00BF4C 8000B34C 3C11800E */ lui $s1, %hi(D_800DC764) # $s1, 0x800e
@@ -57,10 +57,10 @@ glabel func_8000B290
/* 00BF58 8000B358 AE000000 */ sw $zero, ($s0)
/* 00BF5C 8000B35C 10800003 */ beqz $a0, .L8000B36C
/* 00BF60 8000B360 00000000 */ nop
/* 00BF64 8000B364 0C003FEE */ jal particlePtrList_addObject
/* 00BF64 8000B364 0C003FEE */ jal gParticlePtrList_addObject
/* 00BF68 8000B368 00000000 */ nop
.L8000B36C:
/* 00BF6C 8000B36C 0C004013 */ jal particlePtrList_flush
/* 00BF6C 8000B36C 0C004013 */ jal gParticlePtrList_flush
/* 00BF70 8000B370 AE200000 */ sw $zero, ($s1)
/* 00BF74 8000B374 8FBF0024 */ lw $ra, 0x24($sp)
/* 00BF78 8000B378 8FB00018 */ lw $s0, 0x18($sp)
asm/non_matchings/unknown_00BC20/func_8000B750.s
+1 -1
View File
@@ -33,7 +33,7 @@ glabel func_8000B750
/* 00C3A8 8000B7A8 8FBF002C */ lw $ra, 0x2c($sp)
/* 00C3AC 8000B7AC 102000C7 */ beqz $at, .L8000BACC
/* 00C3B0 8000B7B0 24040014 */ li $a0, 20
/* 00C3B4 8000B7B4 0C0078A7 */ jal func_8001E29C
/* 00C3B4 8000B7B4 0C0078A7 */ jal get_misc_asset
/* 00C3B8 8000B7B8 AFA60088 */ sw $a2, 0x88($sp)
/* 00C3BC 8000B7BC 3C0E8012 */ lui $t6, %hi(D_8011B020) # $t6, 0x8012
/* 00C3C0 8000B7C0 25CEB020 */ addiu $t6, %lo(D_8011B020) # addiu $t6, $t6, -0x4fe0
asm/non_matchings/unknown_00BC20/func_8000BADC.s
+7 -7
View File
@@ -29,7 +29,7 @@ glabel func_8000BADC
/* 00C714 8000BB14 AFB20024 */ sw $s2, 0x24($sp)
/* 00C718 8000BB18 AFB0001C */ sw $s0, 0x1c($sp)
/* 00C71C 8000BB1C AC20B004 */ sw $zero, %lo(D_8011B004)($at)
/* 00C720 8000BB20 0C0078A7 */ jal func_8001E29C
/* 00C720 8000BB20 0C0078A7 */ jal get_misc_asset
/* 00C724 8000BB24 24040014 */ li $a0, 20
/* 00C728 8000BB28 24190009 */ li $t9, 9
/* 00C72C 8000BB2C 3C01800E */ lui $at, %hi(D_800DC760) # $at, 0x800e
@@ -57,8 +57,8 @@ glabel func_8000BADC
/* 00C77C 8000BB7C 24630001 */ addiu $v1, $v1, 1
/* 00C780 8000BB80 1420FFF3 */ bnez $at, .L8000BB50
/* 00C784 8000BB84 A06AFFFF */ sb $t2, -1($v1)
/* 00C788 8000BB88 3C0E8012 */ lui $t6, %hi(playerCount) # $t6, 0x8012
/* 00C78C 8000BB8C 8DCEAEF0 */ lw $t6, %lo(playerCount)($t6)
/* 00C788 8000BB88 3C0E8012 */ lui $t6, %hi(gObjectCount) # $t6, 0x8012
/* 00C78C 8000BB8C 8DCEAEF0 */ lw $t6, %lo(gObjectCount)($t6)
/* 00C790 8000BB90 00004025 */ move $t0, $zero
/* 00C794 8000BB94 19C000DD */ blez $t6, .L8000BF0C
/* 00C798 8000BB98 00009025 */ move $s2, $zero
@@ -66,10 +66,10 @@ glabel func_8000BADC
/* 00C7A0 8000BBA0 44819000 */ mtc1 $at, $f18
/* 00C7A4 8000BBA4 44912000 */ mtc1 $s1, $f4
/* 00C7A8 8000BBA8 3C013F80 */ li $at, 0x3F800000 # 1.000000
/* 00C7AC 8000BBAC 3C138012 */ lui $s3, %hi(playerStructArray_Ptr) # $s3, 0x8012
/* 00C7AC 8000BBAC 3C138012 */ lui $s3, %hi(gObjectStructArrayPtr) # $s3, 0x8012
/* 00C7B0 8000BBB0 44817000 */ mtc1 $at, $f14
/* 00C7B4 8000BBB4 44806000 */ mtc1 $zero, $f12
/* 00C7B8 8000BBB8 2673AEE4 */ addiu $s3, %lo(playerStructArray_Ptr) # addiu $s3, $s3, -0x511c
/* 00C7B8 8000BBB8 2673AEE4 */ addiu $s3, %lo(gObjectStructArrayPtr) # addiu $s3, $s3, -0x511c
/* 00C7BC 8000BBBC 24090002 */ li $t1, 2
/* 00C7C0 8000BBC0 46802420 */ cvt.s.w $f16, $f4
.L8000BBC4:
@@ -269,7 +269,7 @@ glabel func_8000BADC
/* 00CA98 8000BE98 A0580001 */ sb $t8, 1($v0)
/* 00CA9C 8000BE9C A04C0002 */ sb $t4, 2($v0)
/* 00CAA0 8000BEA0 820D0175 */ lb $t5, 0x175($s0)
/* 00CAA4 8000BEA4 3C0C8012 */ lui $t4, %hi(playerCount) # $t4, 0x8012
/* 00CAA4 8000BEA4 3C0C8012 */ lui $t4, %hi(gObjectCount) # $t4, 0x8012
/* 00CAA8 8000BEA8 11A0000B */ beqz $t5, .L8000BED8
/* 00CAAC 8000BEAC 00000000 */ nop
/* 00CAB0 8000BEB0 904F0003 */ lbu $t7, 3($v0)
@@ -294,7 +294,7 @@ glabel func_8000BADC
.L8000BEF4:
/* 00CAF4 8000BEF4 A0400003 */ sb $zero, 3($v0)
.L8000BEF8:
/* 00CAF8 8000BEF8 8D8CAEF0 */ lw $t4, %lo(playerCount)($t4)
/* 00CAF8 8000BEF8 8D8CAEF0 */ lw $t4, %lo(gObjectCount)($t4)
/* 00CAFC 8000BEFC 25080001 */ addiu $t0, $t0, 1
/* 00CB00 8000BF00 010C082A */ slt $at, $t0, $t4
/* 00CB04 8000BF04 1420FF2F */ bnez $at, .L8000BBC4
asm/non_matchings/unknown_00BC20/func_8000C718.s
+2 -2
View File
@@ -6,7 +6,7 @@ glabel func_8000C718
/* 00D328 8000C728 AFA40028 */ sw $a0, 0x28($sp)
/* 00D32C 8000C72C 01C41821 */ addu $v1, $t6, $a0
/* 00D330 8000C730 90650000 */ lbu $a1, ($v1)
/* 00D334 8000C734 3C0C8012 */ lui $t4, %hi(D_8011AD64) # $t4, 0x8012
/* 00D334 8000C734 3C0C8012 */ lui $t4, %hi(gAssetsObjectHeadersTable) # $t4, 0x8012
/* 00D338 8000C738 10A0000B */ beqz $a1, .L8000C768
/* 00D33C 8000C73C 3C048012 */ lui $a0, %hi(D_8011AE68) # $a0, 0x8012
/* 00D340 8000C740 24B80001 */ addiu $t8, $a1, 1
@@ -21,7 +21,7 @@ glabel func_8000C718
/* 00D364 8000C764 8FBF0014 */ lw $ra, 0x14($sp)
.L8000C768:
/* 00D368 8000C768 8FA30028 */ lw $v1, 0x28($sp)
/* 00D36C 8000C76C 8D8CAD64 */ lw $t4, %lo(D_8011AD64)($t4)
/* 00D36C 8000C76C 8D8CAD64 */ lw $t4, %lo(gAssetsObjectHeadersTable)($t4)
/* 00D370 8000C770 00035880 */ sll $t3, $v1, 2
/* 00D374 8000C774 018B1021 */ addu $v0, $t4, $t3
/* 00D378 8000C778 8C460000 */ lw $a2, ($v0)
asm/non_matchings/unknown_00BC20/func_8000C8F8.s
+1 -1
View File
@@ -171,7 +171,7 @@ glabel func_8000C8F8
/* 00D778 8000CB78 00000000 */ nop
/* 00D77C 8000CB7C 15000009 */ bnez $t0, .L8000CBA4
/* 00D780 8000CB80 00000000 */ nop
/* 00D784 8000CB84 0C004013 */ jal particlePtrList_flush
/* 00D784 8000CB84 0C004013 */ jal gParticlePtrList_flush
/* 00D788 8000CB88 00000000 */ nop
/* 00D78C 8000CB8C 0C005FA6 */ jal func_80017E98
/* 00D790 8000CB90 00000000 */ nop

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