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

Merge pull request #20 from DavidSM64/davids-branch

Browse Source 
Renamed OS variables
This commit is contained in:
David Benepe
2020-07-05 16:07:07 -05:00
committed by GitHub
parent a45b0e1c32 9441f7768d
commit b520728a93
91 changed files with 278 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/assets/assets.s
+1 -1
View File
@@ -5,7 +5,7 @@
.incbin "\filename"
.endm
.incbin "./build/bin/unknown.0d8200.bin"
.incbin "./build/ucode/unknown_ucode.0d8200.bin"
.incbin "./build/ucode/ucode_boot.0d90c0.bin"
.incbin "./build/ucode/f3ddkr_dram.0d9190.bin"
.incbin "./build/ucode/f3ddkr_fifo.0da390.bin"
asm/non_matchings/unknown_005740/func_8000BADC.s
+2 -2
View File
@@ -60,8 +60,8 @@ glabel func_8000BADC
/* 00C7BC 8000BBBC 24090002 */ li $t1, 2
/* 00C7C0 8000BBC0 46802420 */ cvt.s.w $f16, $f4
.L8000BBC4:
/* 00C7C4 8000BBC4 3C188000 */ lui $t8, %hi(D_80000300) # $t8, 0x8000
/* 00C7C8 8000BBC8 8F180300 */ lw $t8, %lo(D_80000300)($t8)
/* 00C7C4 8000BBC4 3C188000 */ lui $t8, %hi(osTvType) # $t8, 0x8000
/* 00C7C8 8000BBC8 8F180300 */ lw $t8, %lo(osTvType)($t8)
/* 00C7CC 8000BBCC 46008086 */ mov.s $f2, $f16
/* 00C7D0 8000BBD0 17000005 */ bnez $t8, .L8000BBE8
/* 00C7D4 8000BBD4 3C01800E */ lui $at, %hi(D_800E5138) # $at, 0x800e
asm/non_matchings/unknown_005740/func_8000C8B4.s
+2 -2
View File
@@ -1,6 +1,6 @@
glabel func_8000C8B4
/* 00D4B4 8000C8B4 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000
/* 00D4B8 8000C8B8 8DCE0300 */ lw $t6, %lo(D_80000300)($t6)
/* 00D4B4 8000C8B4 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000
/* 00D4B8 8000C8B8 8DCE0300 */ lw $t6, %lo(osTvType)($t6)
/* 00D4BC 8000C8BC 00000000 */ nop
/* 00D4C0 8000C8C0 15C00003 */ bnez $t6, .L8000C8D0
/* 00D4C4 8000C8C4 00000000 */ nop
asm/non_matchings/unknown_005740/func_800120C8.s
+2 -2
View File
@@ -460,7 +460,7 @@ glabel func_800120C8
/* 01336C 8001276C 81CF0053 */ lb $t7, 0x53($t6)
/* 013370 80012770 8FB900B4 */ lw $t9, 0xb4($sp)
/* 013374 80012774 15E10003 */ bne $t7, $at, .L80012784
/* 013378 80012778 3C0D8000 */ lui $t5, %hi(D_80000310) # $t5, 0x8000
/* 013378 80012778 3C0D8000 */ lui $t5, %hi(osCicId) # $t5, 0x8000
/* 01337C 8001277C 10000002 */ b .L80012788
/* 013380 80012780 2409010A */ li $t1, 266
.L80012784:
@@ -471,7 +471,7 @@ glabel func_800120C8
/* 013390 80012790 35380004 */ ori $t8, $t1, 4
/* 013394 80012794 03004825 */ move $t1, $t8
.L80012798:
/* 013398 80012798 8DAD0310 */ lw $t5, %lo(D_80000310)($t5)
/* 013398 80012798 8DAD0310 */ lw $t5, %lo(osCicId)($t5)
/* 01339C 8001279C 240117D7 */ li $at, 6103
/* 0133A0 800127A0 11A10002 */ beq $t5, $at, .L800127AC
/* 0133A4 800127A4 00000000 */ nop
asm/non_matchings/unknown_005740/func_8001A8F4.s
+2 -2
View File
@@ -300,8 +300,8 @@ glabel func_8001A8F4
/* 01B954 8001AD54 00000000 */ nop
/* 01B958 8001AD58 304A0040 */ andi $t2, $v0, 0x40
/* 01B95C 8001AD5C 15400013 */ bnez $t2, .L8001ADAC
/* 01B960 8001AD60 3C0C8000 */ lui $t4, %hi(D_80000300) # $t4, 0x8000
/* 01B964 8001AD64 8D8C0300 */ lw $t4, %lo(D_80000300)($t4)
/* 01B960 8001AD60 3C0C8000 */ lui $t4, %hi(osTvType) # $t4, 0x8000
/* 01B964 8001AD64 8D8C0300 */ lw $t4, %lo(osTvType)($t4)
/* 01B968 8001AD68 8FAE0040 */ lw $t6, 0x40($sp)
/* 01B96C 8001AD6C 15800003 */ bnez $t4, .L8001AD7C
/* 01B970 8001AD70 2402021C */ li $v0, 540
asm/non_matchings/unknown_005740/func_8001AE64.s
+2 -2
View File
@@ -232,8 +232,8 @@ glabel func_8001AE64
/* 01BDC8 8001B1C8 240B0005 */ li $t3, 5
/* 01BDCC 8001B1CC A02FC730 */ sb $t7, %lo(D_800DC730)($at)
.L8001B1D0:
/* 01BDD0 8001B1D0 3C198000 */ lui $t9, %hi(D_80000300) # $t9, 0x8000
/* 01BDD4 8001B1D4 8F390300 */ lw $t9, %lo(D_80000300)($t9)
/* 01BDD0 8001B1D0 3C198000 */ lui $t9, %hi(osTvType) # $t9, 0x8000
/* 01BDD4 8001B1D4 8F390300 */ lw $t9, %lo(osTvType)($t9)
/* 01BDD8 8001B1D8 00107080 */ sll $t6, $s0, 2
/* 01BDDC 8001B1DC 17200010 */ bnez $t9, .L8001B220
/* 01BDE0 8001B1E0 3C188012 */ lui $t8, %hi(D_8011AE80) # $t8, 0x8012
asm/non_matchings/unknown_005740/func_8001C6C4.s
+2 -2
View File
@@ -1,7 +1,7 @@
glabel func_8001C6C4
/* 01D2C4 8001C6C4 27BDFF18 */ addiu $sp, $sp, -0xe8
/* 01D2C8 8001C6C8 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000
/* 01D2CC 8001C6CC 8DCE0300 */ lw $t6, %lo(D_80000300)($t6)
/* 01D2C8 8001C6C8 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000
/* 01D2CC 8001C6CC 8DCE0300 */ lw $t6, %lo(osTvType)($t6)
/* 01D2D0 8001C6D0 AFB2004C */ sw $s2, 0x4c($sp)
/* 01D2D4 8001C6D4 00809025 */ move $s2, $a0
/* 01D2D8 8001C6D8 AFBF005C */ sw $ra, 0x5c($sp)
asm/non_matchings/unknown_005740/func_8001F460.s
+2 -2
View File
@@ -29,9 +29,9 @@ glabel func_8001F460
/* 0200C8 8001F4C8 AFB8019C */ sw $t8, 0x19c($sp)
.L8001F4CC:
/* 0200CC 8001F4CC 8FB9019C */ lw $t9, 0x19c($sp)
/* 0200D0 8001F4D0 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000
/* 0200D0 8001F4D0 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000
/* 0200D4 8001F4D4 44992000 */ mtc1 $t9, $f4
/* 0200D8 8001F4D8 8DCE0300 */ lw $t6, %lo(D_80000300)($t6)
/* 0200D8 8001F4D8 8DCE0300 */ lw $t6, %lo(osTvType)($t6)
/* 0200DC 8001F4DC 46802020 */ cvt.s.w $f0, $f4
/* 0200E0 8001F4E0 3C01800E */ lui $at, %hi(D_800E5674) # $at, 0x800e
/* 0200E4 8001F4E4 00008025 */ move $s0, $zero
asm/non_matchings/unknown_0255E0/D_80024D54.s
+2 -2
View File
@@ -454,8 +454,8 @@ glabel D_80024D54
/* 026008 80025408 00403825 */ move $a3, $v0
/* 02600C 8002540C 0C0310BB */ jal func_800C42EC
/* 026010 80025410 00002025 */ move $a0, $zero
/* 026014 80025414 3C198000 */ lui $t9, %hi(D_80000300) # $t9, 0x8000
/* 026018 80025418 8F390300 */ lw $t9, %lo(D_80000300)($t9)
/* 026014 80025414 3C198000 */ lui $t9, %hi(osTvType) # $t9, 0x8000
/* 026018 80025418 8F390300 */ lw $t9, %lo(osTvType)($t9)
/* 02601C 8002541C 02202025 */ move $a0, $s1
/* 026020 80025420 17200004 */ bnez $t9, .L80025434
/* 026024 80025424 3C07800E */ lui $a3, %hi(D_800E5DF0) # $a3, 0x800e
asm/non_matchings/unknown_0255E0/func_800289B8.s
+2 -2
View File
@@ -52,10 +52,10 @@ glabel func_800289B8
/* 029680 80028A80 AE0F0000 */ sw $t7, ($s0)
/* 029684 80028A84 37180020 */ ori $t8, (0x05100020 & 0xFFFF) # ori $t8, $t8, 0x20
/* 029688 80028A88 00E8C821 */ addu $t9, $a3, $t0
/* 02968C 80028A8C 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000
/* 02968C 80028A8C 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000
/* 029690 80028A90 AC590004 */ sw $t9, 4($v0)
/* 029694 80028A94 AC580000 */ sw $t8, ($v0)
/* 029698 80028A98 8DCE0300 */ lw $t6, %lo(D_80000300)($t6)
/* 029698 80028A98 8DCE0300 */ lw $t6, %lo(osTvType)($t6)
/* 02969C 80028A9C 2410FF6A */ li $s0, -150
/* 0296A0 80028AA0 15C00004 */ bnez $t6, .L80028AB4
/* 0296A4 80028AA4 24040096 */ li $a0, 150
asm/non_matchings/unknown_032760/func_80033F60.s
+2 -2
View File
@@ -1,9 +1,9 @@
glabel func_80033F60
/* 034B60 80033F60 27BDFF78 */ addiu $sp, $sp, -0x88
/* 034B64 80033F64 44852000 */ mtc1 $a1, $f4
/* 034B68 80033F68 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000
/* 034B68 80033F68 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000
/* 034B6C 80033F6C 46802020 */ cvt.s.w $f0, $f4
/* 034B70 80033F70 8DEF0300 */ lw $t7, %lo(D_80000300)($t7)
/* 034B70 80033F70 8DEF0300 */ lw $t7, %lo(osTvType)($t7)
/* 034B74 80033F74 AFBF002C */ sw $ra, 0x2c($sp)
/* 034B78 80033F78 AFB00028 */ sw $s0, 0x28($sp)
/* 034B7C 80033F7C AFA5008C */ sw $a1, 0x8c($sp)
asm/non_matchings/unknown_032760/func_80034860.s
+2 -2
View File
@@ -1,8 +1,8 @@
glabel func_80034860
/* 035460 80034860 44852000 */ mtc1 $a1, $f4
/* 035464 80034864 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000
/* 035464 80034864 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000
/* 035468 80034868 468020A0 */ cvt.s.w $f2, $f4
/* 03546C 8003486C 8DEF0300 */ lw $t7, %lo(D_80000300)($t7)
/* 03546C 8003486C 8DEF0300 */ lw $t7, %lo(osTvType)($t7)
/* 035470 80034870 27BDFFA0 */ addiu $sp, $sp, -0x60
/* 035474 80034874 AFB00028 */ sw $s0, 0x28($sp)
/* 035478 80034878 00808025 */ move $s0, $a0
asm/non_matchings/unknown_032760/func_80035260.s
+2 -2
View File
@@ -1,9 +1,9 @@
glabel func_80035260
/* 035E60 80035260 27BDFFA8 */ addiu $sp, $sp, -0x58
/* 035E64 80035264 44852000 */ mtc1 $a1, $f4
/* 035E68 80035268 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000
/* 035E68 80035268 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000
/* 035E6C 8003526C 468020A0 */ cvt.s.w $f2, $f4
/* 035E70 80035270 8DCE0300 */ lw $t6, %lo(D_80000300)($t6)
/* 035E70 80035270 8DCE0300 */ lw $t6, %lo(osTvType)($t6)
/* 035E74 80035274 AFBF0024 */ sw $ra, 0x24($sp)
/* 035E78 80035278 AFB10020 */ sw $s1, 0x20($sp)
/* 035E7C 8003527C AFB0001C */ sw $s0, 0x1c($sp)
asm/non_matchings/unknown_032760/func_800361E0.s
+2 -2
View File
@@ -5,10 +5,10 @@ glabel func_800361E0
/* 036DEC 800361EC AFB10028 */ sw $s1, 0x28($sp)
/* 036DF0 800361F0 AFB00024 */ sw $s0, 0x24($sp)
/* 036DF4 800361F4 AFA50084 */ sw $a1, 0x84($sp)
/* 036DF8 800361F8 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000
/* 036DF8 800361F8 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000
/* 036DFC 800361FC 46803020 */ cvt.s.w $f0, $f6
/* 036E00 80036200 C4840010 */ lwc1 $f4, 0x10($a0)
/* 036E04 80036204 8DEF0300 */ lw $t7, %lo(D_80000300)($t7)
/* 036E04 80036204 8DEF0300 */ lw $t7, %lo(osTvType)($t7)
/* 036E08 80036208 00808025 */ move $s0, $a0
/* 036E0C 8003620C 46000086 */ mov.s $f2, $f0
/* 036E10 80036210 15E00007 */ bnez $t7, .L80036230
asm/non_matchings/unknown_032760/func_800389B8.s
+2 -2
View File
@@ -1,8 +1,8 @@
glabel func_800389B8
/* 0395B8 800389B8 44852000 */ mtc1 $a1, $f4
/* 0395BC 800389BC 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000
/* 0395BC 800389BC 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000
/* 0395C0 800389C0 468020A0 */ cvt.s.w $f2, $f4
/* 0395C4 800389C4 8DCE0300 */ lw $t6, %lo(D_80000300)($t6)
/* 0395C4 800389C4 8DCE0300 */ lw $t6, %lo(osTvType)($t6)
/* 0395C8 800389C8 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 0395CC 800389CC AFBF0014 */ sw $ra, 0x14($sp)
/* 0395D0 800389D0 15C00007 */ bnez $t6, .L800389F0
asm/non_matchings/unknown_032760/func_80038AD4.s
+2 -2
View File
@@ -1,8 +1,8 @@
glabel func_80038AD4
/* 0396D4 80038AD4 44852000 */ mtc1 $a1, $f4
/* 0396D8 80038AD8 3C0E8000 */ lui $t6, %hi(D_80000300) # $t6, 0x8000
/* 0396D8 80038AD8 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000
/* 0396DC 80038ADC 468020A0 */ cvt.s.w $f2, $f4
/* 0396E0 80038AE0 8DCE0300 */ lw $t6, %lo(D_80000300)($t6)
/* 0396E0 80038AE0 8DCE0300 */ lw $t6, %lo(osTvType)($t6)
/* 0396E4 80038AE4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 0396E8 80038AE8 AFBF0014 */ sw $ra, 0x14($sp)
/* 0396EC 80038AEC 15C00007 */ bnez $t6, .L80038B0C
asm/non_matchings/unknown_032760/func_80039330.s
+2 -2
View File
@@ -6,10 +6,10 @@ glabel func_80039330
/* 039F40 80039340 AFB00024 */ sw $s0, 0x24($sp)
/* 039F44 80039344 AFA500B4 */ sw $a1, 0xb4($sp)
/* 039F48 80039348 A3A0006B */ sb $zero, 0x6b($sp)
/* 039F4C 8003934C 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000
/* 039F4C 8003934C 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000
/* 039F50 80039350 468030A0 */ cvt.s.w $f2, $f6
/* 039F54 80039354 C4840010 */ lwc1 $f4, 0x10($a0)
/* 039F58 80039358 8DEF0300 */ lw $t7, %lo(D_80000300)($t7)
/* 039F58 80039358 8DEF0300 */ lw $t7, %lo(osTvType)($t7)
/* 039F5C 8003935C 00808025 */ move $s0, $a0
/* 039F60 80039360 46001006 */ mov.s $f0, $f2
/* 039F64 80039364 15E00007 */ bnez $t7, .L80039384
asm/non_matchings/unknown_032760/func_8003B4BC.s
+2 -2
View File
@@ -1,9 +1,9 @@
glabel func_8003B4BC
/* 03C0BC 8003B4BC 44852000 */ mtc1 $a1, $f4
/* 03C0C0 8003B4C0 27BDFFB0 */ addiu $sp, $sp, -0x50
/* 03C0C4 8003B4C4 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000
/* 03C0C4 8003B4C4 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000
/* 03C0C8 8003B4C8 46802020 */ cvt.s.w $f0, $f4
/* 03C0CC 8003B4CC 8DEF0300 */ lw $t7, %lo(D_80000300)($t7)
/* 03C0CC 8003B4CC 8DEF0300 */ lw $t7, %lo(osTvType)($t7)
/* 03C0D0 8003B4D0 AFB10020 */ sw $s1, 0x20($sp)
/* 03C0D4 8003B4D4 00808825 */ move $s1, $a0
/* 03C0D8 8003B4D8 AFBF0024 */ sw $ra, 0x24($sp)
asm/non_matchings/unknown_032760/func_8003B988.s
+2 -2
View File
@@ -4,10 +4,10 @@ glabel func_8003B988
/* 03C590 8003B990 AFBF0024 */ sw $ra, 0x24($sp)
/* 03C594 8003B994 AFB00020 */ sw $s0, 0x20($sp)
/* 03C598 8003B998 AFA50064 */ sw $a1, 0x64($sp)
/* 03C59C 8003B99C 3C188000 */ lui $t8, %hi(D_80000300) # $t8, 0x8000
/* 03C59C 8003B99C 3C188000 */ lui $t8, %hi(osTvType) # $t8, 0x8000
/* 03C5A0 8003B9A0 46802020 */ cvt.s.w $f0, $f4
/* 03C5A4 8003B9A4 8C8E003C */ lw $t6, 0x3c($a0)
/* 03C5A8 8003B9A8 8F180300 */ lw $t8, %lo(D_80000300)($t8)
/* 03C5A8 8003B9A8 8F180300 */ lw $t8, %lo(osTvType)($t8)
/* 03C5AC 8003B9AC 00808025 */ move $s0, $a0
/* 03C5B0 8003B9B0 46000086 */ mov.s $f2, $f0
/* 03C5B4 8003B9B4 17000007 */ bnez $t8, .L8003B9D4
asm/non_matchings/unknown_032760/func_8003CA68.s
+2 -2
View File
@@ -4,9 +4,9 @@ glabel func_8003CA68
/* 03D670 8003CA70 AFBF0024 */ sw $ra, 0x24($sp)
/* 03D674 8003CA74 AFB00020 */ sw $s0, 0x20($sp)
/* 03D678 8003CA78 AFA50074 */ sw $a1, 0x74($sp)
/* 03D67C 8003CA7C 3C0F8000 */ lui $t7, %hi(D_80000300) # $t7, 0x8000
/* 03D67C 8003CA7C 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000
/* 03D680 8003CA80 46802020 */ cvt.s.w $f0, $f4
/* 03D684 8003CA84 8DEF0300 */ lw $t7, %lo(D_80000300)($t7)
/* 03D684 8003CA84 8DEF0300 */ lw $t7, %lo(osTvType)($t7)
/* 03D688 8003CA88 8C830064 */ lw $v1, 0x64($a0)
/* 03D68C 8003CA8C 8C88003C */ lw $t0, 0x3c($a0)
/* 03D690 8003CA90 00808025 */ move $s0, $a0

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