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

Fixed merge conflict with master.

Browse Source
This commit is contained in:
Antonio Castelli
2021-06-06 17:12:51 -07:00
parent 8d46c31ba4 0886355f10
commit d7439afb98
299 changed files with 7847 additions and 9223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1
View File
@@ -272,6 +272,7 @@ $(BUILD_DIR)/lib/src/unknown_0C91A0.o : OPT_FLAGS := -O1
$(BUILD_DIR)/lib/src/unknown_0D29F0.o: OPT_FLAGS := -O1
$(BUILD_DIR)/lib/src/unknown_0CDE90.o: OPT_FLAGS := -O1
$(BUILD_DIR)/lib/src/unknown_0D3160.o: OPT_FLAGS := -O1
$(BUILD_DIR)/lib/src/unknown_0D3360.o: OPT_FLAGS := -O1
$(BUILD_DIR)/lib/src/unknown_0D5EC0.o: OPT_FLAGS := -O1
$(BUILD_DIR)/lib/src/unknown_0C9C90.o: OPT_FLAGS := -O2 -Wo,-loopunroll,0
$(BUILD_DIR)/lib/src/osCreateThread.o : OPT_FLAGS := -O1
asm/non_matchings/unknown_001050/func_800015F8.s
+9
View File
@@ -1,3 +1,12 @@
.late_rodata
glabel D_800E49E0
.float 46875.0
glabel D_800E49E4
.float 46875.0
glabel D_800E49E8
.float 120000.0
.text
glabel func_800015F8
/* 0021F8 800015F8 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 0021FC 800015FC AFBF0014 */ sw $ra, 0x14($sp)
asm/non_matchings/unknown_003260/_handleEvent.s
+13 -2
View File
@@ -1,3 +1,8 @@
.late_rodata
glabel jpt_800E4BB0
.word L800035C4, L80003A0C, L80004090, L80003B2C, L80004090, L80004090, L80004090, L80003C8C, L80004090, L80004090, L80004090, L80004090, L80004090, L80004090, L80004090, L80003BA4
.text
glabel _handleEvent
/* 004070 80003470 27BDFF30 */ addiu $sp, $sp, -0xd0
/* 004074 80003474 AFBE0038 */ sw $fp, 0x38($sp)
@@ -84,12 +89,13 @@ glabel _handleEvent
/* 0041A0 800035A0 2D210010 */ sltiu $at, $t1, 0x10
/* 0041A4 800035A4 102002BA */ beqz $at, .L80004090
/* 0041A8 800035A8 00094880 */ sll $t1, $t1, 2
/* 0041AC 800035AC 3C01800E */ lui $at, %hi(D_800E4BB0) # $at, 0x800e
/* 0041AC 800035AC 3C01800E */ lui $at, %hi(jpt_800E4BB0) # $at, 0x800e
/* 0041B0 800035B0 00290821 */ addu $at, $at, $t1
/* 0041B4 800035B4 8C294BB0 */ lw $t1, %lo(D_800E4BB0)($at)
/* 0041B4 800035B4 8C294BB0 */ lw $t1, %lo(jpt_800E4BB0)($at)
/* 0041B8 800035B8 00000000 */ nop
/* 0041BC 800035BC 01200008 */ jr $t1
/* 0041C0 800035C0 00000000 */ nop
glabel L800035C4
/* 0041C4 800035C4 9222003F */ lbu $v0, 0x3f($s1)
/* 0041C8 800035C8 24010005 */ li $at, 5
/* 0041CC 800035CC 10410004 */ beq $v0, $at, .L800035E0
@@ -386,6 +392,7 @@ glabel _handleEvent
/* 004604 80003A04 100001A3 */ b .L80004094
/* 004608 80003A08 01601025 */ move $v0, $t3
.L80003A0C:
glabel L80003A0C
/* 00460C 80003A0C 24011000 */ li $at, 4096
.L80003A10:
/* 004610 80003A10 14610006 */ bne $v1, $at, .L80003A2C
@@ -466,6 +473,7 @@ glabel _handleEvent
.L80003B24:
/* 004724 80003B24 1000015B */ b .L80004094
/* 004728 80003B28 306202D1 */ andi $v0, $v1, 0x2d1
glabel L80003B2C
/* 00472C 80003B2C 8EAA0008 */ lw $t2, 8($s5)
/* 004730 80003B30 922B003F */ lbu $t3, 0x3f($s1)
/* 004734 80003B34 A22A003C */ sb $t2, 0x3c($s1)
@@ -500,6 +508,7 @@ glabel _handleEvent
/* 004798 80003B98 304D02D1 */ andi $t5, $v0, 0x2d1
/* 00479C 80003B9C 1000013D */ b .L80004094
/* 0047A0 80003BA0 01A01025 */ move $v0, $t5
glabel L80003BA4
/* 0047A4 80003BA4 C6A40008 */ lwc1 $f4, 8($s5)
/* 0047A8 80003BA8 9229003F */ lbu $t1, 0x3f($s1)
/* 0047AC 80003BAC E624002C */ swc1 $f4, 0x2c($s1)
@@ -566,6 +575,7 @@ glabel _handleEvent
/* 004880 80003C80 304902D1 */ andi $t1, $v0, 0x2d1
/* 004884 80003C84 10000103 */ b .L80004094
/* 004888 80003C88 01201025 */ move $v0, $t1
glabel L80003C8C
/* 00488C 80003C8C 8EB80008 */ lw $t8, 8($s5)
/* 004890 80003C90 922E003F */ lbu $t6, 0x3f($s1)
/* 004894 80003C94 A6380034 */ sh $t8, 0x34($s1)
@@ -835,6 +845,7 @@ glabel _handleEvent
/* 004C88 80004088 10000002 */ b .L80004094
/* 004C8C 8000408C 01A01025 */ move $v0, $t5
.L80004090:
glabel L80004090
/* 004C90 80004090 306202D1 */ andi $v0, $v1, 0x2d1
.L80004094:
/* 004C94 80004094 8FA30074 */ lw $v1, 0x74($sp)
asm/non_matchings/unknown_005740/func_80004B40.s
+5
View File
@@ -1,3 +1,8 @@
.late_rodata
glabel D_800E4BF0
.float 10000.0
.text
glabel func_80004B40
/* 005740 80004B40 27BDFFA8 */ addiu $sp, $sp, -0x58
/* 005744 80004B44 AFB30024 */ sw $s3, 0x24($sp)
asm/non_matchings/unknown_005740/func_80005254.s
+27
View File
@@ -1,3 +1,30 @@
.late_rodata
glabel D_800E4BF8
.double 0.4
glabel D_800E4C00
.float 10000.0
.word 0 # Padding
glabel D_800E4C08
.double 0.05
glabel D_800E4C10
.double 0.95
glabel D_800E4C18
.double 0.13
glabel D_800E4C20
.double 0.3
glabel D_800E4C28
.double 0.02
glabel D_800E4C30
.double 0.01
glabel D_800E4C38
.float 0.4
.word 0 # Padding
glabel D_800E4C40
.double 0.005
glabel D_800E4C48
.double -0.1
.text
glabel func_80005254
/* 005E54 80005254 27BDFF60 */ addiu $sp, $sp, -0xa0
/* 005E58 80005258 3C088012 */ lui $t0, %hi(D_80119C3C) # $t0, 0x8012
asm/non_matchings/unknown_005740/func_80005D08.s
+15
View File
@@ -1,3 +1,18 @@
.late_rodata
glabel D_800E4C50
.double 0.05
glabel D_800E4C58
.double 0.95
glabel D_800E4C60
.double 0.3
glabel D_800E4C68
.double 6.5534
glabel D_800E4C70
.float 6.5534
glabel D_800E4C74
.float 10000.0
.text
glabel func_80005D08
/* 006908 80005D08 27BDFFC8 */ addiu $sp, $sp, -0x38
/* 00690C 80005D0C AFBF0014 */ sw $ra, 0x14($sp)
asm/non_matchings/unknown_005740/func_800063EC.s
+14
View File
@@ -1,3 +1,17 @@
.late_rodata
glabel D_800E4C78
.float 10000.0
.word 0 # Padding
glabel D_800E4C80
.double 0.05
glabel D_800E4C88
.double 0.95
glabel D_800E4C90
.double 6.5534
glabel D_800E4C98
.float 6.5534
.text
glabel func_800063EC
/* 006FEC 800063EC 27BDFFD0 */ addiu $sp, $sp, -0x30
/* 006FF0 800063F0 AFBF0014 */ sw $ra, 0x14($sp)
asm/non_matchings/unknown_005740/func_80006BFC.s
+14
View File
@@ -1,3 +1,17 @@
.late_rodata
glabel D_800E4CA0
.double 1731.23404
glabel D_800E4CA8
.double 0.8
glabel D_800E4CB0
.float 0.8
.word 0 # Padding
glabel D_800E4CB8
.double -0.8
glabel D_800E4CC0
.float -0.8
.text
glabel func_80006BFC
/* 0077FC 80006BFC 27BDFFB8 */ addiu $sp, $sp, -0x48
/* 007800 80006C00 AFBF0014 */ sw $ra, 0x14($sp)
asm/non_matchings/unknown_005740/func_80006FC8.s
+22
View File
@@ -1,3 +1,25 @@
.late_rodata
glabel D_800E4CC4
.float 2250000.0
glabel D_800E4CC8
.double 0.05
glabel D_800E4CD0
.float 1500.0
glabel D_800E4CD4
.float 0.05
glabel D_800E4CD8
.double 0.05
glabel D_800E4CE0
.float 2250000.0
.word 0 # Padding
glabel D_800E4CE8
.double 0.8
glabel D_800E4CF0
.float 1500.0
glabel D_800E4CF4
.float 0.05
.text
glabel func_80006FC8
/* 007BC8 80006FC8 27BDFF38 */ addiu $sp, $sp, -0xc8
/* 007BCC 80006FCC AFB70064 */ sw $s7, 0x64($sp)
asm/non_matchings/unknown_005740/func_80007FA4.s
+5
View File
@@ -1,3 +1,8 @@
.late_rodata
glabel D_800E4CF8
.double 0.001
.text
glabel func_80007FA4
/* 008BA4 80007FA4 3C013F80 */ li $at, 0x3F800000 # 1.000000
/* 008BA8 80007FA8 44818000 */ mtc1 $at, $f16
asm/non_matchings/unknown_005740/func_80008174.s
+5
View File
@@ -1,3 +1,8 @@
.late_rodata
glabel D_800E4F10
.float -100000.0
.text
glabel func_80008174
/* 008D74 80008174 27BDFFC0 */ addiu $sp, $sp, -0x40
/* 008D78 80008178 3C038012 */ lui $v1, %hi(D_80119C4C) # $v1, 0x8012
asm/non_matchings/unknown_005740/func_80008438.s
+5
View File
@@ -1,3 +1,8 @@
.late_rodata
glabel D_800E4F14
.float 999999.0
.text
glabel func_80008438
/* 009038 80008438 27BDFD98 */ addiu $sp, $sp, -0x268
/* 00903C 8000843C AFBF006C */ sw $ra, 0x6c($sp)
asm/non_matchings/unknown_005740/func_800099EC.s
+5
View File
@@ -1,3 +1,8 @@
.late_rodata
glabel D_800E4F18
.double -100000.0
.text
glabel func_800099EC
/* 00A5EC 800099EC 308E00FF */ andi $t6, $a0, 0xff
/* 00A5F0 800099F0 000E7880 */ sll $t7, $t6, 2
asm/non_matchings/unknown_005740/func_80009AB4.s
+5
View File
@@ -1,3 +1,8 @@
.late_rodata
glabel D_800E4F20
.double -100000.0
.text
glabel func_80009AB4
/* 00A6B4 80009AB4 308E00FF */ andi $t6, $a0, 0xff
/* 00A6B8 80009AB8 000E7880 */ sll $t7, $t6, 2
asm/non_matchings/unknown_00BC20/func_8000B750.s
+7
View File
@@ -1,3 +1,10 @@
.late_rodata
glabel D_800E5130
.float 1.09
glabel D_800E5134
.float 1.18
.text
glabel func_8000B750
/* 00C350 8000B750 27BDFF80 */ addiu $sp, $sp, -0x80
/* 00C354 8000B754 AFB00028 */ sw $s0, 0x28($sp)
asm/non_matchings/unknown_00BC20/func_8000BADC.s
+13
View File
@@ -1,3 +1,16 @@
.late_rodata
glabel D_800E5138
.float 1.2
glabel D_800E513C
.float 2.4
glabel D_800E5140
.float 4.8
glabel D_800E5144
.float 0.05
glabel D_800E5148
.float 0.1
.text
glabel func_8000BADC
/* 00C6DC 8000BADC 3C028012 */ lui $v0, %hi(D_8011B008) # $v0, 0x8012
/* 00C6E0 8000BAE0 2442B008 */ addiu $v0, %lo(D_8011B008) # addiu $v0, $v0, -0x4ff8
asm/non_matchings/unknown_00BC20/func_8000CC7C.s
+17 -2
View File
@@ -1,3 +1,16 @@
.late_rodata
glabel jpt_800E5154
.word L8000D974, L8000D974, L8000D974, L8000D974, L8000D974, L8000D98C, L8000D974, L8000D974, L8000D974
glabel D_800E5178
.float 0.0099999999
glabel D_800E517C
.float 0.0099999999
glabel D_800E5180
.float 1.4
glabel D_800E5184
.float 0.714
.text
glabel func_8000CC7C
/* 00D87C 8000CC7C 27BDFEB0 */ addiu $sp, $sp, -0x150
/* 00D880 8000CC80 3C018012 */ lui $at, %hi(D_8011AD20) # $at, 0x8012
@@ -915,12 +928,13 @@ glabel func_8000CC7C
/* 00E550 8000D950 2DE10009 */ sltiu $at, $t7, 9
/* 00E554 8000D954 1020000D */ beqz $at, .L8000D98C
/* 00E558 8000D958 000F7880 */ sll $t7, $t7, 2
/* 00E55C 8000D95C 3C01800E */ lui $at, %hi(D_800E5154) # $at, 0x800e
/* 00E55C 8000D95C 3C01800E */ lui $at, %hi(jpt_800E5154) # $at, 0x800e
/* 00E560 8000D960 002F0821 */ addu $at, $at, $t7
/* 00E564 8000D964 8C2F5154 */ lw $t7, %lo(D_800E5154)($at)
/* 00E564 8000D964 8C2F5154 */ lw $t7, %lo(jpt_800E5154)($at)
/* 00E568 8000D968 00000000 */ nop
/* 00E56C 8000D96C 01E00008 */ jr $t7
/* 00E570 8000D970 00000000 */ nop
glabel L8000D974
/* 00E574 8000D974 02202025 */ move $a0, $s1
/* 00E578 8000D978 0C0170BC */ jal func_8005C2F0
/* 00E57C 8000D97C 02602825 */ move $a1, $s3
@@ -928,6 +942,7 @@ glabel func_8000CC7C
/* 00E584 8000D984 10000003 */ b .L8000D994
/* 00E588 8000D988 24020005 */ li $v0, 5
.L8000D98C:
glabel L8000D98C
/* 00E58C 8000D98C 8FA40068 */ lw $a0, 0x68($sp)
/* 00E590 8000D990 24020005 */ li $v0, 5
.L8000D994:
asm/non_matchings/unknown_00BC20/func_8000E0B0.s
+12 -2
View File
@@ -1,3 +1,8 @@
.late_rodata
glabel jpt_800E5188
.word L8000E104, L8000E0E4, L8000E0F4, L8000E0F4, L8000E0FC, L8000E104, L8000E0FC, L8000E0EC, L8000E104
.text
glabel func_8000E0B0
/* 00ECB0 8000E0B0 3C0E8012 */ lui $t6, %hi(D_8011AD38) # $t6, 0x8012
/* 00ECB4 8000E0B4 8DCEAD38 */ lw $t6, %lo(D_8011AD38)($t6)
@@ -6,20 +11,25 @@ glabel func_8000E0B0
/* 00ECC0 8000E0C0 10200014 */ beqz $at, .L8000E114
/* 00ECC4 8000E0C4 AFBF0014 */ sw $ra, 0x14($sp)
/* 00ECC8 8000E0C8 000E7080 */ sll $t6, $t6, 2
/* 00ECCC 8000E0CC 3C01800E */ lui $at, %hi(D_800E5188) # $at, 0x800e
/* 00ECCC 8000E0CC 3C01800E */ lui $at, %hi(jpt_800E5188) # $at, 0x800e
/* 00ECD0 8000E0D0 002E0821 */ addu $at, $at, $t6
/* 00ECD4 8000E0D4 8C2E5188 */ lw $t6, %lo(D_800E5188)($at)
/* 00ECD4 8000E0D4 8C2E5188 */ lw $t6, %lo(jpt_800E5188)($at)
/* 00ECD8 8000E0D8 00000000 */ nop
/* 00ECDC 8000E0DC 01C00008 */ jr $t6
/* 00ECE0 8000E0E0 00000000 */ nop
glabel L8000E0E4
/* 00ECE4 8000E0E4 1000000C */ b .L8000E118
/* 00ECE8 8000E0E8 2402FFFF */ li $v0, -1
glabel L8000E0EC
/* 00ECEC 8000E0EC 1000000A */ b .L8000E118
/* 00ECF0 8000E0F0 00001025 */ move $v0, $zero
glabel L8000E0F4
/* 00ECF4 8000E0F4 10000008 */ b .L8000E118
/* 00ECF8 8000E0F8 24020003 */ li $v0, 3
glabel L8000E0FC
/* 00ECFC 8000E0FC 10000006 */ b .L8000E118
/* 00ED00 8000E100 24020002 */ li $v0, 2
glabel L8000E104
/* 00ED04 8000E104 0C016788 */ jal func_80059E20
/* 00ED08 8000E108 00000000 */ nop
/* 00ED0C 8000E10C 10000003 */ b .L8000E11C
asm/non_matchings/unknown_00BC20/func_8000E2B4.s
+7
View File
@@ -1,3 +1,10 @@
.late_rodata
glabel D_800E51AC
.float 1.4
glabel D_800E51B0
.float 0.714
.text
glabel func_8000E2B4
/* 00EEB4 8000E2B4 3C038012 */ lui $v1, %hi(D_8011AD44) # $v1, 0x8012
/* 00EEB8 8000E2B8 2463AD44 */ addiu $v1, %lo(D_8011AD44) # addiu $v1, $v1, -0x52bc
asm/non_matchings/unknown_00BC20/func_8000EA54.s
+14 -2
View File
@@ -1,3 +1,8 @@
.late_rodata
glabel jpt_800E51B4
.word L8000ECD8, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000ED98, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000ECF4, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000ED10, L8000EDE0, L8000EDE0, L8000EDE0, L8000ED40, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000ED54
.text
glabel func_8000EA54
/* 00F654 8000EA54 27BDFF98 */ addiu $sp, $sp, -0x68
/* 00F658 8000EA58 AFBF0024 */ sw $ra, 0x24($sp)
@@ -162,12 +167,13 @@ glabel func_8000EA54
/* 00F8B4 8000ECB4 2D410027 */ sltiu $at, $t2, 0x27
/* 00F8B8 8000ECB8 10200049 */ beqz $at, .L8000EDE0
/* 00F8BC 8000ECBC 000A5080 */ sll $t2, $t2, 2
/* 00F8C0 8000ECC0 3C01800E */ lui $at, %hi(D_800E51B4) # $at, 0x800e
/* 00F8C0 8000ECC0 3C01800E */ lui $at, %hi(jpt_800E51B4) # $at, 0x800e
/* 00F8C4 8000ECC4 002A0821 */ addu $at, $at, $t2
/* 00F8C8 8000ECC8 8C2A51B4 */ lw $t2, %lo(D_800E51B4)($at)
/* 00F8C8 8000ECC8 8C2A51B4 */ lw $t2, %lo(jpt_800E51B4)($at)
/* 00F8CC 8000ECCC 00000000 */ nop
/* 00F8D0 8000ECD0 01400008 */ jr $t2
/* 00F8D4 8000ECD4 00000000 */ nop
glabel L8000ECD8
/* 00F8D8 8000ECD8 24040007 */ li $a0, 7
/* 00F8DC 8000ECDC 0C01867D */ jal func_800619F4
/* 00F8E0 8000ECE0 AFA6005C */ sw $a2, 0x5c($sp)
@@ -175,6 +181,7 @@ glabel func_8000EA54
/* 00F8E8 8000ECE8 8FA7006C */ lw $a3, 0x6c($sp)
/* 00F8EC 8000ECEC 1000003D */ b .L8000EDE4
/* 00F8F0 8000ECF0 8FAF002C */ lw $t7, 0x2c($sp)
glabel L8000ECF4
/* 00F8F4 8000ECF4 0C02708A */ jal func_8009C228
/* 00F8F8 8000ECF8 00002025 */ move $a0, $zero
/* 00F8FC 8000ECFC A242003A */ sb $v0, 0x3a($s2)
@@ -182,6 +189,7 @@ glabel func_8000EA54
/* 00F904 8000ED04 00403025 */ move $a2, $v0
/* 00F908 8000ED08 10000035 */ b .L8000EDE0
/* 00F90C 8000ED0C 24530001 */ addiu $s3, $v0, 1
glabel L8000ED10
/* 00F910 8000ED10 922B0048 */ lbu $t3, 0x48($s1)
/* 00F914 8000ED14 9629000E */ lhu $t1, 0xe($s1)
/* 00F918 8000ED18 256CFFFF */ addiu $t4, $t3, -1
@@ -194,11 +202,13 @@ glabel func_8000EA54
/* 00F934 8000ED34 24D30001 */ addiu $s3, $a2, 1
/* 00F938 8000ED38 10000029 */ b .L8000EDE0
/* 00F93C 8000ED3C A246003A */ sb $a2, 0x3a($s2)
glabel L8000ED40
/* 00F940 8000ED40 92260017 */ lbu $a2, 0x17($s1)
/* 00F944 8000ED44 00000000 */ nop
/* 00F948 8000ED48 24D30001 */ addiu $s3, $a2, 1
/* 00F94C 8000ED4C 10000024 */ b .L8000EDE0
/* 00F950 8000ED50 A246003A */ sb $a2, 0x3a($s2)
glabel L8000ED54
/* 00F954 8000ED54 9638000E */ lhu $t8, 0xe($s1)
/* 00F958 8000ED58 00009825 */ move $s3, $zero
/* 00F95C 8000ED5C 24020003 */ li $v0, 3
@@ -218,6 +228,7 @@ glabel func_8000EA54
/* 00F98C 8000ED8C A246003A */ sb $a2, 0x3a($s2)
/* 00F990 8000ED90 10000013 */ b .L8000EDE0
/* 00F994 8000ED94 24D30001 */ addiu $s3, $a2, 1
glabel L8000ED98
/* 00F998 8000ED98 24130001 */ li $s3, 1
/* 00F99C 8000ED9C 0C027B1C */ jal is_in_adventure_two
/* 00F9A0 8000EDA0 AFA6005C */ sw $a2, 0x5c($sp)
@@ -238,6 +249,7 @@ glabel func_8000EA54
/* 00F9D8 8000EDD8 8FA7006C */ lw $a3, 0x6c($sp)
/* 00F9DC 8000EDDC 00000000 */ nop
.L8000EDE0:
glabel L8000EDE0
/* 00F9E0 8000EDE0 8FAF002C */ lw $t7, 0x2c($sp)
.L8000EDE4:
/* 00F9E4 8000EDE4 00000000 */ nop

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