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 branch 'master' of https://github.com/DavidSM64/Diddy-Kong-Racing

Browse Source
This commit is contained in:
David Benepe
2020-07-01 01:50:32 -05:00
parent 1f1744e1bd c23ae885f3
commit f6bf65ea27
7 changed files with 48 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/unknown_0255E0/func_800257D0.s
-22
View File
@@ -1,22 +0,0 @@
glabel func_800257D0
/* 0263D0 800257D0 3C0E800E */ lui $t6, %hi(D_800DC924) # $t6, 0x800e
/* 0263D4 800257D4 8DCEC924 */ lw $t6, %lo(D_800DC924)($t6)
/* 0263D8 800257D8 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 0263DC 800257DC 11C0000B */ beqz $t6, .L8002580C
/* 0263E0 800257E0 AFBF0014 */ sw $ra, 0x14($sp)
/* 0263E4 800257E4 3C048012 */ lui $a0, %hi(D_8011D474) # $a0, 0x8012
/* 0263E8 800257E8 8C84D474 */ lw $a0, %lo(D_8011D474)($a0)
/* 0263EC 800257EC 0C01C450 */ jal func_80071140
/* 0263F0 800257F0 00000000 */ nop
/* 0263F4 800257F4 3C04800E */ lui $a0, %hi(D_800DC924) # $a0, 0x800e
/* 0263F8 800257F8 8C84C924 */ lw $a0, %lo(D_800DC924)($a0)
/* 0263FC 800257FC 0C01C450 */ jal func_80071140
/* 026400 80025800 00000000 */ nop
/* 026404 80025804 3C01800E */ lui $at, %hi(D_800DC924) # $at, 0x800e
/* 026408 80025808 AC20C924 */ sw $zero, %lo(D_800DC924)($at)
.L8002580C:
/* 02640C 8002580C 8FBF0014 */ lw $ra, 0x14($sp)
/* 026410 80025810 27BD0018 */ addiu $sp, $sp, 0x18
/* 026414 80025814 03E00008 */ jr $ra
/* 026418 80025818 00000000 */ nop
asm/non_matchings/unknown_0255E0/func_80028044.s
-5
View File
@@ -1,5 +0,0 @@
glabel func_80028044
/* 028C44 80028044 3C018012 */ lui $at, 0x8012
/* 028C48 80028048 03E00008 */ jr $ra
/* 028C4C 8002804C AC24B0DC */ sw $a0, -0x4f24($at)
asm/non_matchings/unknown_0255E0/func_80028FA0.s
-5
View File
@@ -1,5 +0,0 @@
glabel func_80028FA0
/* 029BA0 80028FA0 3C018012 */ lui $at, 0x8012
/* 029BA4 80028FA4 03E00008 */ jr $ra
/* 029BA8 80028FA8 AC24B0FC */ sw $a0, -0x4f04($at)
asm/non_matchings/unknown_0255E0/func_8002ACC8.s
-5
View File
@@ -1,5 +0,0 @@
glabel func_8002ACC8
/* 02B8C8 8002ACC8 3C018012 */ lui $at, 0x8012
/* 02B8CC 8002ACCC 03E00008 */ jr $ra
/* 02B8D0 8002ACD0 AC24B0F4 */ sw $a0, -0x4f0c($at)
asm/non_matchings/unknown_0255E0/func_8002ACD4.s
-15
View File
@@ -1,15 +0,0 @@
glabel func_8002ACD4
/* 02B8D4 8002ACD4 3C018012 */ lui $at, %hi(D_8011B0E4) # $at, 0x8012
/* 02B8D8 8002ACD8 C424B0E4 */ lwc1 $f4, %lo(D_8011B0E4)($at)
/* 02B8DC 8002ACDC 3C018012 */ lui $at, %hi(D_8011B0E8) # $at, 0x8012
/* 02B8E0 8002ACE0 E4840000 */ swc1 $f4, ($a0)
/* 02B8E4 8002ACE4 C426B0E8 */ lwc1 $f6, %lo(D_8011B0E8)($at)
/* 02B8E8 8002ACE8 3C018012 */ lui $at, %hi(D_8011B0EC) # $at, 0x8012
/* 02B8EC 8002ACEC E4A60000 */ swc1 $f6, ($a1)
/* 02B8F0 8002ACF0 C428B0EC */ lwc1 $f8, %lo(D_8011B0EC)($at)
/* 02B8F4 8002ACF4 3C028012 */ lui $v0, %hi(D_8011B0F0) # $v0, 0x8012
/* 02B8F8 8002ACF8 E4C80000 */ swc1 $f8, ($a2)
/* 02B8FC 8002ACFC 8C42B0F0 */ lw $v0, %lo(D_8011B0F0)($v0)
/* 02B900 8002AD00 03E00008 */ jr $ra
/* 02B904 8002AD04 00000000 */ nop
asm/non_matchings/unknown_0255E0/func_8002C7C4.s
-6
View File
@@ -1,6 +0,0 @@
glabel func_8002C7C4
/* 02D3C4 8002C7C4 3C02800E */ lui $v0, %hi(D_800DC918) # $v0, 0x800e
/* 02D3C8 8002C7C8 8C42C918 */ lw $v0, %lo(D_800DC918)($v0)
/* 02D3CC 8002C7CC 03E00008 */ jr $ra
/* 02D3D0 8002C7D0 00000000 */ nop
src/unknown_0255E0.c
+48 -6
View File
@@ -4,7 +4,19 @@
#include "types.h"
#include "macros.h"
extern s32 D_800DC924;
extern s32 D_8011D37C;
extern s32 D_8011D474;
extern s32 D_8011B0DC;
extern s32 D_8011B0F0;
extern s32 D_8011B0F4;
extern s32 D_8011B0FC;
extern f32 D_8011B0E4;
extern f32 D_8011B0E8;
extern f32 D_8011B0EC;
extern s32* D_800DC918;
s32 func_800249E0(s32 arg0) {
D_8011D37C = arg0;
@@ -14,7 +26,15 @@ s32 func_800249E0(s32 arg0) {
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_800249F0.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/D_80024D54.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80025510.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_800257D0.s")
void func_800257D0(void) {
if (D_800DC924 != 0) {
func_80071140(D_8011D474);
func_80071140(D_800DC924);
D_800DC924 = 0;
}
}
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002581C.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80026070.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80026430.s")
@@ -25,12 +45,20 @@ GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80027568.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_800278E8.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80027E24.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80027FC4.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80028044.s")
void func_80028044(s32 arg0) {
D_8011B0DC = arg0;
}
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80028050.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_800289B8.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80028C10.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80028CD0.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80028FA0.s")
void func_80028FA0(s32 arg0) {
D_8011B0FC = arg0;
}
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80028FAC.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80029658.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80029AF8.s")
@@ -42,15 +70,29 @@ GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002A2DC.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002A31C.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002A5F8.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002A900.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002ACC8.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002ACD4.s")
void func_8002ACC8(s32 arg0) {
D_8011B0F4 = arg0;
}
s32 func_8002ACD4(f32* arg0, f32* arg1, f32* arg2) {
*arg0 = D_8011B0E4;
*arg1 = D_8011B0E8;
*arg2 = D_8011B0EC;
return D_8011B0F0;
}
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002AD08.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002B0F4.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002B9BC.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002BAB0.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002C0C4.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002C71C.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002C7C4.s")
s32* func_8002C7C4(void) {
return D_800DC918;
}
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002C7D4.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002C954.s")
GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002CC30.s")