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

Moved rodata from C to GLOBAL_ASM in unknown_09F8F0

Browse Source
This commit is contained in:
David Benepe
2021-06-05 02:08:35 -05:00
parent 6ea6204c63
commit af39526564
14 changed files with 170 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/unknown_09F8F0/func_8009F034.s
+26
View File
@@ -1,3 +1,29 @@
.late_rodata
glabel D_800E86A8
.double 0.6
glabel D_800E86B0
.double 1.2
glabel D_800E86B8
.float 263.0
glabel D_800E86BC
.float 259.0
glabel D_800E86C0
.float 265.0
.word 0 # padding
glabel D_800E86C8
.double 1.2
glabel D_800E86D0
.double 0.6
glabel D_800E86D8
.double 1.2
glabel D_800E86E0
.double 0.6
glabel D_800E86E8
.double 1.2
glabel D_800E86F0
.double 0.6
.text
glabel func_8009F034
/* 09FC34 8009F034 27BDFF68 */ addiu $sp, $sp, -0x98
/* 09FC38 8009F038 AFBF0064 */ sw $ra, 0x64($sp)
asm/non_matchings/unknown_09F8F0/func_800A0EB4.s
+15 -2
View File
@@ -1,3 +1,8 @@
.late_rodata
glabel jpt_800E86F8
.word L800A0F28, L800A0F38, L800A0F48, L800A0F58, L800A0F6C, L800A0F80, L800A0F94, L800A0FAC
.text
glabel func_800A0EB4
/* 0A1AB4 800A0EB4 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 0A1AB8 800A0EB8 3C0E800E */ lui $t6, %hi(D_800E2790) # $t6, 0x800e
@@ -22,45 +27,53 @@ glabel func_800A0EB4
/* 0A1B04 800A0F04 1020002D */ beqz $at, .L800A0FBC
/* 0A1B08 800A0F08 26100420 */ addiu $s0, $s0, 0x420
/* 0A1B0C 800A0F0C 00094880 */ sll $t1, $t1, 2
/* 0A1B10 800A0F10 3C01800F */ lui $at, %hi(D_800E86F8) # $at, 0x800f
/* 0A1B10 800A0F10 3C01800F */ lui $at, %hi(jpt_800E86F8) # $at, 0x800f
/* 0A1B14 800A0F14 00290821 */ addu $at, $at, $t1
/* 0A1B18 800A0F18 8C2986F8 */ lw $t1, %lo(D_800E86F8)($at)
/* 0A1B18 800A0F18 8C2986F8 */ lw $t1, %lo(jpt_800E86F8)($at)
/* 0A1B1C 800A0F1C 00000000 */ nop
/* 0A1B20 800A0F20 01200008 */ jr $t1
/* 0A1B24 800A0F24 00000000 */ nop
glabel L800A0F28
/* 0A1B28 800A0F28 240A0021 */ li $t2, 33
/* 0A1B2C 800A0F2C A60A0006 */ sh $t2, 6($s0)
/* 0A1B30 800A0F30 10000025 */ b .L800A0FC8
/* 0A1B34 800A0F34 A6000000 */ sh $zero, ($s0)
glabel L800A0F38
/* 0A1B38 800A0F38 240B0020 */ li $t3, 32
/* 0A1B3C 800A0F3C A60B0006 */ sh $t3, 6($s0)
/* 0A1B40 800A0F40 10000021 */ b .L800A0FC8
/* 0A1B44 800A0F44 A6000000 */ sh $zero, ($s0)
glabel L800A0F48
/* 0A1B48 800A0F48 240C001F */ li $t4, 31
/* 0A1B4C 800A0F4C A60C0006 */ sh $t4, 6($s0)
/* 0A1B50 800A0F50 1000001D */ b .L800A0FC8
/* 0A1B54 800A0F54 A6000000 */ sh $zero, ($s0)
glabel L800A0F58
/* 0A1B58 800A0F58 24028000 */ li $v0, -32768
/* 0A1B5C 800A0F5C 240D0021 */ li $t5, 33
/* 0A1B60 800A0F60 A60D0006 */ sh $t5, 6($s0)
/* 0A1B64 800A0F64 10000018 */ b .L800A0FC8
/* 0A1B68 800A0F68 A6020000 */ sh $v0, ($s0)
glabel L800A0F6C
/* 0A1B6C 800A0F6C 24028000 */ li $v0, -32768
/* 0A1B70 800A0F70 240E0020 */ li $t6, 32
/* 0A1B74 800A0F74 A60E0006 */ sh $t6, 6($s0)
/* 0A1B78 800A0F78 10000013 */ b .L800A0FC8
/* 0A1B7C 800A0F7C A6020000 */ sh $v0, ($s0)
glabel L800A0F80
/* 0A1B80 800A0F80 24028000 */ li $v0, -32768
/* 0A1B84 800A0F84 2418001F */ li $t8, 31
/* 0A1B88 800A0F88 A6180006 */ sh $t8, 6($s0)
/* 0A1B8C 800A0F8C 1000000E */ b .L800A0FC8
/* 0A1B90 800A0F90 A6020000 */ sh $v0, ($s0)
glabel L800A0F94
/* 0A1B94 800A0F94 24028000 */ li $v0, -32768
/* 0A1B98 800A0F98 2419001E */ li $t9, 30
/* 0A1B9C 800A0F9C A6190006 */ sh $t9, 6($s0)
/* 0A1BA0 800A0FA0 A6020000 */ sh $v0, ($s0)
/* 0A1BA4 800A0FA4 10000008 */ b .L800A0FC8
/* 0A1BA8 800A0FA8 A6020002 */ sh $v0, 2($s0)
glabel L800A0FAC
/* 0A1BAC 800A0FAC 240F001E */ li $t7, 30
/* 0A1BB0 800A0FB0 A60F0006 */ sh $t7, 6($s0)
/* 0A1BB4 800A0FB4 10000004 */ b .L800A0FC8
asm/non_matchings/unknown_09F8F0/func_800A1248.s
+5
View File
@@ -1,3 +1,8 @@
.late_rodata
glabel D_800E8718
.float 275.0
.text
glabel func_800A1248
/* 0A1E48 800A1248 27BDFFB8 */ addiu $sp, $sp, -0x48
/* 0A1E4C 800A124C AFBF002C */ sw $ra, 0x2c($sp)
asm/non_matchings/unknown_09F8F0/func_800A14F0.s
+7
View File
@@ -1,3 +1,10 @@
.late_rodata
glabel D_800E8720
.double 66.0
glabel D_800E8728
.double 66.0
.text
glabel func_800A14F0
/* 0A20F0 800A14F0 27BDFFA0 */ addiu $sp, $sp, -0x60
/* 0A20F4 800A14F4 AFBF0014 */ sw $ra, 0x14($sp)
asm/non_matchings/unknown_09F8F0/func_800A1E48.s
+5
View File
@@ -1,3 +1,8 @@
.late_rodata
glabel D_800E8730
.double 66.0
.text
glabel func_800A1E48
/* 0A2A48 800A1E48 27BDFF78 */ addiu $sp, $sp, -0x88
/* 0A2A4C 800A1E4C AFB00020 */ sw $s0, 0x20($sp)
asm/non_matchings/unknown_09F8F0/func_800A277C.s
+29
View File
@@ -1,3 +1,32 @@
.rdata
glabel D_800E8640
.asciz "CAN'T"
.ascii "\0\0" # padding
glabel D_800E8648
.asciz "SAVE"
.ascii "\0\0\0" # padding
glabel D_800E8650
.asciz "GHOST"
.ascii "\0\0" # padding
glabel D_800E8658
.asciz " CONTROLLER"
glabel D_800E8664
.asciz "PAK"
glabel D_800E8668
.asciz "FULL"
.ascii "\0\0\0" # padding
glabel D_800E8670
.asciz " CONTROLLER"
glabel D_800E867C
.asciz "PAK"
glabel D_800E8680
.asciz "DAMAGED"
.late_rodata
glabel D_800E8738
.double 1.2
.text
glabel func_800A277C
/* 0A337C 800A277C 27BDFF40 */ addiu $sp, $sp, -0xc0
/* 0A3380 800A2780 AFB00020 */ sw $s0, 0x20($sp)
asm/non_matchings/unknown_09F8F0/func_800A3884.s
+5
View File
@@ -1,3 +1,8 @@
.late_rodata
glabel D_800E8740
.float 25744.0
.text
glabel func_800A3884
/* 0A4484 800A3884 3C0E8012 */ lui $t6, %hi(D_80126D37) # $t6, 0x8012
/* 0A4488 800A3888 91CE6D37 */ lbu $t6, %lo(D_80126D37)($t6)
asm/non_matchings/unknown_09F8F0/func_800A5F18.s
+11
View File
@@ -1,3 +1,14 @@
.rdata
glabel D_800E8688
.asciz "RACE"
.ascii "\0\0\0" # padding
glabel D_800E8690
.asciz "LAP"
glabel D_800E8694
.asciz "DID NOT FINISH"
.ascii "\0" # padding
.text
glabel func_800A5F18
/* 0A6B18 800A5F18 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 0A6B1C 800A5F1C 3C078012 */ lui $a3, %hi(D_80126CDC) # $a3, 0x8012
asm/non_matchings/unknown_09F8F0/func_800A6254.s
+16 -2
View File
@@ -1,3 +1,12 @@
.late_rodata
glabel jpt_800E8744
.word L800A63D8, L800A691C, L800A6BCC, L800A6CA4, L800A6D68
glabel D_800E8758
.double 1.1
glabel D_800E8760
.double 1.1
.text
glabel func_800A6254
/* 0A6E54 800A6254 27BDFF90 */ addiu $sp, $sp, -0x70
/* 0A6E58 800A6258 AFBF0014 */ sw $ra, 0x14($sp)
@@ -92,12 +101,13 @@ glabel func_800A6254
/* 0A6FB4 800A63B4 2F210005 */ sltiu $at, $t9, 5
/* 0A6FB8 800A63B8 10200278 */ beqz $at, .L800A6D9C
/* 0A6FBC 800A63BC 0019C880 */ sll $t9, $t9, 2
/* 0A6FC0 800A63C0 3C01800F */ lui $at, %hi(D_800E8744) # $at, 0x800f
/* 0A6FC0 800A63C0 3C01800F */ lui $at, %hi(jpt_800E8744) # $at, 0x800f
/* 0A6FC4 800A63C4 00390821 */ addu $at, $at, $t9
/* 0A6FC8 800A63C8 8C398744 */ lw $t9, %lo(D_800E8744)($at)
/* 0A6FC8 800A63C8 8C398744 */ lw $t9, %lo(jpt_800E8744)($at)
/* 0A6FCC 800A63CC 00000000 */ nop
/* 0A6FD0 800A63D0 03200008 */ jr $t9
/* 0A6FD4 800A63D4 00000000 */ nop
glabel L800A63D8
/* 0A6FD8 800A63D8 8FAA005C */ lw $t2, 0x5c($sp)
/* 0A6FDC 800A63DC 240C007F */ li $t4, 127
/* 0A6FE0 800A63E0 314B0040 */ andi $t3, $t2, 0x40
@@ -460,6 +470,7 @@ glabel func_800A6254
/* 0A7510 800A6910 8FAD0038 */ lw $t5, 0x38($sp)
/* 0A7514 800A6914 10000123 */ b .L800A6DA4
/* 0A7518 800A6918 A1CD017C */ sb $t5, 0x17c($t6)
glabel L800A691C
/* 0A751C 800A691C 8FA40074 */ lw $a0, 0x74($sp)
/* 0A7520 800A6920 804505FD */ lb $a1, 0x5fd($v0)
/* 0A7524 800A6924 00047880 */ sll $t7, $a0, 2
@@ -644,6 +655,7 @@ glabel func_800A6254
/* 0A77C0 800A6BC0 00E02025 */ move $a0, $a3
/* 0A77C4 800A6BC4 10000078 */ b .L800A6DA8
/* 0A77C8 800A6BC8 8FBF0014 */ lw $ra, 0x14($sp)
glabel L800A6BCC
/* 0A77CC 800A6BCC 804B05FB */ lb $t3, 0x5fb($v0)
/* 0A77D0 800A6BD0 8FAC0074 */ lw $t4, 0x74($sp)
/* 0A77D4 800A6BD4 240FFF88 */ li $t7, -120
@@ -702,6 +714,7 @@ glabel func_800A6254
/* 0A7898 800A6C98 00E02025 */ move $a0, $a3
/* 0A789C 800A6C9C 10000042 */ b .L800A6DA8
/* 0A78A0 800A6CA0 8FBF0014 */ lw $ra, 0x14($sp)
glabel L800A6CA4
/* 0A78A4 800A6CA4 8FAF005C */ lw $t7, 0x5c($sp)
/* 0A78A8 800A6CA8 24010040 */ li $at, 64
/* 0A78AC 800A6CAC 15E10003 */ bne $t7, $at, .L800A6CBC
@@ -754,6 +767,7 @@ glabel func_800A6254
/* 0A795C 800A6D5C 00E02025 */ move $a0, $a3
/* 0A7960 800A6D60 10000011 */ b .L800A6DA8
/* 0A7964 800A6D64 8FBF0014 */ lw $ra, 0x14($sp)
glabel L800A6D68
/* 0A7968 800A6D68 84EC0000 */ lh $t4, ($a3)
/* 0A796C 800A6D6C 806D000C */ lb $t5, 0xc($v1)
/* 0A7970 800A6D70 240F0005 */ li $t7, 5
asm/non_matchings/unknown_09F8F0/func_800A6E30.s
+12 -2
View File
@@ -1,3 +1,8 @@
.late_rodata
glabel jpt_800E8768
.word L800A6E70, L800A6F3C, L800A7014, L800A70D4, L800A7158
.text
glabel func_800A6E30
/* 0A7A30 800A6E30 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012
/* 0A7A34 800A6E34 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc
@@ -9,12 +14,13 @@ glabel func_800A6E30
/* 0A7A4C 800A6E4C 2DC10005 */ sltiu $at, $t6, 5
/* 0A7A50 800A6E50 102000CA */ beqz $at, .L800A717C
/* 0A7A54 800A6E54 000E7080 */ sll $t6, $t6, 2
/* 0A7A58 800A6E58 3C01800F */ lui $at, %hi(D_800E8768) # $at, 0x800f
/* 0A7A58 800A6E58 3C01800F */ lui $at, %hi(jpt_800E8768) # $at, 0x800f
/* 0A7A5C 800A6E5C 002E0821 */ addu $at, $at, $t6
/* 0A7A60 800A6E60 8C2E8768 */ lw $t6, %lo(D_800E8768)($at)
/* 0A7A60 800A6E60 8C2E8768 */ lw $t6, %lo(jpt_800E8768)($at)
/* 0A7A64 800A6E64 00000000 */ nop
/* 0A7A68 800A6E68 01C00008 */ jr $t6
/* 0A7A6C 800A6E6C 00000000 */ nop
glabel L800A6E70
/* 0A7A70 800A6E70 3C03800E */ lui $v1, %hi(D_800E2770) # $v1, 0x800e
/* 0A7A74 800A6E74 24632770 */ addiu $v1, %lo(D_800E2770) # addiu $v1, $v1, 0x2770
/* 0A7A78 800A6E78 240F007F */ li $t7, 127
@@ -71,6 +77,7 @@ glabel func_800A6E30
/* 0A7B30 800A6F30 24180001 */ li $t8, 1
/* 0A7B34 800A6F34 10000091 */ b .L800A717C
/* 0A7B38 800A6F38 A33801DA */ sb $t8, 0x1da($t9)
glabel L800A6F3C
/* 0A7B3C 800A6F3C 00051880 */ sll $v1, $a1, 2
/* 0A7B40 800A6F40 00651823 */ subu $v1, $v1, $a1
/* 0A7B44 800A6F44 804401DD */ lb $a0, 0x1dd($v0)
@@ -127,6 +134,7 @@ glabel func_800A6E30
/* 0A7C08 800A7008 24E701C0 */ addiu $a3, $a3, 0x1c0
/* 0A7C0C 800A700C 1000005C */ b .L800A7180
/* 0A7C10 800A7010 8FBF0014 */ lw $ra, 0x14($sp)
glabel L800A7014
/* 0A7C14 800A7014 805801DB */ lb $t8, 0x1db($v0)
/* 0A7C18 800A7018 240A0003 */ li $t2, 3
/* 0A7C1C 800A701C 0305C821 */ addu $t9, $t8, $a1
@@ -181,6 +189,7 @@ glabel func_800A6E30
/* 0A7CC8 800A70C8 244701C0 */ addiu $a3, $v0, 0x1c0
/* 0A7CCC 800A70CC 1000002C */ b .L800A7180
/* 0A7CD0 800A70D0 8FBF0014 */ lw $ra, 0x14($sp)
glabel L800A70D4
/* 0A7CD4 800A70D4 0005C880 */ sll $t9, $a1, 2
/* 0A7CD8 800A70D8 0325C823 */ subu $t9, $t9, $a1
/* 0A7CDC 800A70DC 0019C880 */ sll $t9, $t9, 2
@@ -215,6 +224,7 @@ glabel func_800A6E30
/* 0A7D4C 800A714C 244701C0 */ addiu $a3, $v0, 0x1c0
/* 0A7D50 800A7150 1000000B */ b .L800A7180
/* 0A7D54 800A7154 8FBF0014 */ lw $ra, 0x14($sp)
glabel L800A7158
/* 0A7D58 800A7158 3C03800E */ lui $v1, %hi(D_800E2770) # $v1, 0x800e
/* 0A7D5C 800A715C 24632770 */ addiu $v1, %lo(D_800E2770) # addiu $v1, $v1, 0x2770
/* 0A7D60 800A7160 240BFFFF */ li $t3, -1
asm/non_matchings/unknown_09F8F0/func_800A7520.s
+11
View File
@@ -1,3 +1,14 @@
.late_rodata
glabel D_800E8780
.double 0.04687
glabel D_800E8788
.double 682.6583
glabel D_800E8790
.double 0.18
glabel D_800E8798
.double 0.04687
.text
glabel func_800A7520
/* 0A8120 800A7520 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 0A8124 800A7524 AFBF0014 */ sw $ra, 0x14($sp)
asm/non_matchings/unknown_09F8F0/func_800A8474.s
+20
View File
@@ -1,3 +1,23 @@
.late_rodata
glabel D_800E87A0
.double 1.1
glabel D_800E87A8
.float 181.5
.word 0 # padding
glabel D_800E87B0
.double 66.0
glabel D_800E87B8
.double 66.0
glabel D_800E87C0
.double 1.1
glabel D_800E87C8
.double 1.2
glabel D_800E87D0
.float 0.8
glabel D_800E87D4
.float 1.2
.text
glabel func_800A8474
/* 0A9074 800A8474 27BDFEA0 */ addiu $sp, $sp, -0x160
/* 0A9078 800A8478 AFBF003C */ sw $ra, 0x3c($sp)
asm/non_matchings/unknown_09F8F0/func_800AA600.s
+8
View File
@@ -1,3 +1,11 @@
.late_rodata
glabel D_800E87D8
.float 1.1
.word 0 # Padding
glabel D_800E87E0
.double 1.1
.text
glabel func_800AA600
/* 0AB200 800AA600 27BDFF48 */ addiu $sp, $sp, -0xb8
/* 0AB204 800AA604 AFBF002C */ sw $ra, 0x2c($sp)
src/unknown_09F8F0.c
-72
View File
@@ -367,78 +367,6 @@ s16 D_800E2C98[4] = {
/*******************************/
/************ .rodata ************/
const char D_800E8640[] = "CAN'T";
const char D_800E8648[] = "SAVE";
const char D_800E8650[] = "GHOST";
const char D_800E8658[] = " CONTROLLER";
const char D_800E8664[] = "PAK";
const char D_800E8668[] = "FULL";
const char D_800E8670[] = " CONTROLLER";
const char D_800E867C[] = "PAK";
const char D_800E8680[] = "DAMAGED";
const char D_800E8688[] = "RACE";
const char D_800E8690[] = "LAP";
const char D_800E8694[] = "DID NOT FINISH";
const DoubleLiteral D_800E86A8 = { 0.6 };
const DoubleLiteral D_800E86B0 = { 1.2 };
const FloatLiteral D_800E86B8 = { 263.0f };
const FloatLiteral D_800E86BC = { 259.0f };
const FloatLiteral D_800E86C0 = { 265.0f };
const DoubleLiteral D_800E86C8 = { 1.2 };
const DoubleLiteral D_800E86D0 = { 0.6 };
const DoubleLiteral D_800E86D8 = { 1.2 };
const DoubleLiteral D_800E86E0 = { 0.6 };
const DoubleLiteral D_800E86E8 = { 1.2 };
const DoubleLiteral D_800E86F0 = { 0.6 };
// Jump table in func_800A0EB4
const u32 D_800E86F8[] = {
0x800A0F28, 0x800A0F38, 0x800A0F48, 0x800A0F58,
0x800A0F6C, 0x800A0F80, 0x800A0F94, 0x800A0FAC
};
const FloatLiteral D_800E8718 = { 275.0f };
const DoubleLiteral D_800E8720 = { 66.0 };
const DoubleLiteral D_800E8728 = { 66.0 };
const DoubleLiteral D_800E8730 = { 66.0 };
const DoubleLiteral D_800E8738 = { 1.2 };
const FloatLiteral D_800E8740 = { 25744.0f };
// Jump table in func_800A6254
const u32 D_800E8744[] = {
0x800A63D8, 0x800A691C, 0x800A6BCC, 0x800A6CA4,
0x800A6D68
};
const DoubleLiteral D_800E8758 = { 1.1 };
const DoubleLiteral D_800E8760 = { 1.1 };
// Jump table in func_800A6E30
const u32 D_800E8768[] = {
0x800A6E70, 0x800A6F3C, 0x800A7014, 0x800A70D4,
0x800A7158
};
const DoubleLiteral D_800E8780 = { 0.04687 };
const DoubleLiteral D_800E8788 = { 682.6583 };
const DoubleLiteral D_800E8790 = { 0.18 };
const DoubleLiteral D_800E8798 = { 0.04687 };
const DoubleLiteral D_800E87A0 = { 1.1 };
const FloatLiteral D_800E87A8 = { 181.5f };
const DoubleLiteral D_800E87B0 = { 66.0 };
const DoubleLiteral D_800E87B8 = { 66.0 };
const DoubleLiteral D_800E87C0 = { 1.1 };
const DoubleLiteral D_800E87C8 = { 1.2 };
const FloatLiteral D_800E87D0 = { 0.8f };
const FloatLiteral D_800E87D8 = { 1.2f };
const FloatLiteral D_800E87E0 = { 1.1f };
const DoubleLiteral D_800E87E8 = { 1.1 };
/*********************************/
/************ .bss ************/
extern u8 D_80126CD0;