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 #12 from Faschz/unknown_001050

Browse Source 
Decomp 6 functions in unknown_001050
This commit is contained in:
David Benepe
2020-07-03 14:48:19 -05:00
committed by GitHub
parent 15e19b97d2 065c7d093b
commit 5bd994ff50
5 changed files with 57 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/unknown_001050/func_80000C38.s
-27
View File
@@ -1,27 +0,0 @@
glabel func_80000C38
/* 001838 80000C38 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 00183C 80000C3C AFA40018 */ sw $a0, 0x18($sp)
/* 001840 80000C40 308500FF */ andi $a1, $a0, 0xff
/* 001844 80000C44 3C04800E */ lui $a0, %hi(D_800DC634) # $a0, 0x800e
/* 001848 80000C48 AFBF0014 */ sw $ra, 0x14($sp)
/* 00184C 80000C4C 8C84C634 */ lw $a0, %lo(D_800DC634)($a0)
/* 001850 80000C50 0C002C04 */ jal func_8000B010
/* 001854 80000C54 00000000 */ nop
/* 001858 80000C58 8FBF0014 */ lw $ra, 0x14($sp)
/* 00185C 80000C5C 27BD0018 */ addiu $sp, $sp, 0x18
/* 001860 80000C60 03E00008 */ jr $ra
/* 001864 80000C64 00000000 */ nop
/* 001868 80000C68 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 00186C 80000C6C AFA40018 */ sw $a0, 0x18($sp)
/* 001870 80000C70 308500FF */ andi $a1, $a0, 0xff
/* 001874 80000C74 3C04800E */ lui $a0, %hi(D_800DC630) # $a0, 0x800e
/* 001878 80000C78 AFBF0014 */ sw $ra, 0x14($sp)
/* 00187C 80000C7C 8C84C630 */ lw $a0, %lo(D_800DC630)($a0)
/* 001880 80000C80 0C018EA4 */ jal func_80063A90
/* 001884 80000C84 00000000 */ nop
/* 001888 80000C88 8FBF0014 */ lw $ra, 0x14($sp)
/* 00188C 80000C8C 27BD0018 */ addiu $sp, $sp, 0x18
/* 001890 80000C90 03E00008 */ jr $ra
/* 001894 80000C94 00000000 */ nop
asm/non_matchings/unknown_001050/func_80001114.s
-17
View File
@@ -1,17 +0,0 @@
glabel func_80001114
/* 001D14 80001114 308500FF */ andi $a1, $a0, 0xff
/* 001D18 80001118 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 001D1C 8000111C 28A10010 */ slti $at, $a1, 0x10
/* 001D20 80001120 AFBF0014 */ sw $ra, 0x14($sp)
/* 001D24 80001124 10200005 */ beqz $at, .L8000113C
/* 001D28 80001128 AFA40018 */ sw $a0, 0x18($sp)
/* 001D2C 8000112C 3C04800E */ lui $a0, %hi(D_800DC630) # $a0, 0x800e
/* 001D30 80001130 8C84C630 */ lw $a0, %lo(D_800DC630)($a0)
/* 001D34 80001134 0C018EBC */ jal func_80063AF0
/* 001D38 80001138 00000000 */ nop
.L8000113C:
/* 001D3C 8000113C 8FBF0014 */ lw $ra, 0x14($sp)
/* 001D40 80001140 27BD0018 */ addiu $sp, $sp, 0x18
/* 001D44 80001144 03E00008 */ jr $ra
/* 001D48 80001148 00000000 */ nop
asm/non_matchings/unknown_001050/func_80001170.s
-17
View File
@@ -1,17 +0,0 @@
glabel func_80001170
/* 001D70 80001170 308500FF */ andi $a1, $a0, 0xff
/* 001D74 80001174 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 001D78 80001178 28A10010 */ slti $at, $a1, 0x10
/* 001D7C 8000117C AFBF0014 */ sw $ra, 0x14($sp)
/* 001D80 80001180 10200005 */ beqz $at, .L80001198
/* 001D84 80001184 AFA40018 */ sw $a0, 0x18($sp)
/* 001D88 80001188 3C04800E */ lui $a0, %hi(D_800DC630) # $a0, 0x800e
/* 001D8C 8000118C 8C84C630 */ lw $a0, %lo(D_800DC630)($a0)
/* 001D90 80001190 0C018ED1 */ jal func_80063B44
/* 001D94 80001194 00000000 */ nop
.L80001198:
/* 001D98 80001198 8FBF0014 */ lw $ra, 0x14($sp)
/* 001D9C 8000119C 27BD0018 */ addiu $sp, $sp, 0x18
/* 001DA0 800011A0 03E00008 */ jr $ra
/* 001DA4 800011A4 00000000 */ nop
asm/non_matchings/unknown_001050/func_80002128.s
-43
View File
@@ -1,43 +0,0 @@
glabel func_80002128
/* 002D28 80002128 10800004 */ beqz $a0, .L8000213C
/* 002D2C 8000212C 3C0E8011 */ lui $t6, %hi(D_80115D18) # $t6, 0x8011
/* 002D30 80002130 8DCE5D18 */ lw $t6, %lo(D_80115D18)($t6)
/* 002D34 80002134 00000000 */ nop
/* 002D38 80002138 AC8E0000 */ sw $t6, ($a0)
.L8000213C:
/* 002D3C 8000213C 10A00004 */ beqz $a1, .L80002150
/* 002D40 80002140 3C0F8011 */ lui $t7, %hi(D_80115D28) # $t7, 0x8011
/* 002D44 80002144 8DEF5D28 */ lw $t7, %lo(D_80115D28)($t7)
/* 002D48 80002148 00000000 */ nop
/* 002D4C 8000214C ACAF0000 */ sw $t7, ($a1)
.L80002150:
/* 002D50 80002150 10C00004 */ beqz $a2, .L80002164
/* 002D54 80002154 3C188011 */ lui $t8, %hi(D_80115D20) # $t8, 0x8011
/* 002D58 80002158 8F185D20 */ lw $t8, %lo(D_80115D20)($t8)
/* 002D5C 8000215C 00000000 */ nop
/* 002D60 80002160 ACD80000 */ sw $t8, ($a2)
.L80002164:
/* 002D64 80002164 03E00008 */ jr $ra
/* 002D68 80002168 00000000 */ nop
/* 002D6C 8000216C 10800004 */ beqz $a0, .L80002180
/* 002D70 80002170 3C0E8011 */ lui $t6, %hi(D_80115D1C) # $t6, 0x8011
/* 002D74 80002174 8DCE5D1C */ lw $t6, %lo(D_80115D1C)($t6)
/* 002D78 80002178 00000000 */ nop
/* 002D7C 8000217C AC8E0000 */ sw $t6, ($a0)
.L80002180:
/* 002D80 80002180 10A00004 */ beqz $a1, .L80002194
/* 002D84 80002184 3C0F8011 */ lui $t7, %hi(D_80115D2C) # $t7, 0x8011
/* 002D88 80002188 8DEF5D2C */ lw $t7, %lo(D_80115D2C)($t7)
/* 002D8C 8000218C 00000000 */ nop
/* 002D90 80002190 ACAF0000 */ sw $t7, ($a1)
.L80002194:
/* 002D94 80002194 10C00004 */ beqz $a2, .L800021A8
/* 002D98 80002198 3C188011 */ lui $t8, %hi(D_80115D24) # $t8, 0x8011
/* 002D9C 8000219C 8F185D24 */ lw $t8, %lo(D_80115D24)($t8)
/* 002DA0 800021A0 00000000 */ nop
/* 002DA4 800021A4 ACD80000 */ sw $t8, ($a2)
.L800021A8:
/* 002DA8 800021A8 03E00008 */ jr $ra
/* 002DAC 800021AC 00000000 */ nop
src/mips1/unknown_001050.c
+57 -5
View File
@@ -7,17 +7,24 @@
extern u8 D_800DC638;
extern s8 D_800DC670;
extern u8 D_80115D05;
extern u8 D_80115D41;
extern s16 D_80115D30;
extern s32 D_800DC634;
extern s32 D_800DC648;
extern s32 D_800DC654;
extern s32 D_800DC658;
extern s32 D_80115D18;
extern s32 D_80115D1C;
extern s32 D_80115D20;
extern s32 D_80115D24;
extern s32 D_80115D28;
extern s32 D_80115D2C;
extern s32 D_80115D38;
extern s32 D_80115D3C;
extern s32* D_800DC630;
extern s32* D_800DC634;
extern f32 D_800DC650;
@@ -44,7 +51,15 @@ void func_80000C2C(void) {
D_800DC670 = 0;
}
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80000C38.s")
void func_80000C38(u8 arg0) {
func_8000B010(D_800DC634, arg0);
}
/* Unused? */
void func_80000C68(u8 arg0) {
func_80063A90(D_800DC630, arg0);
}
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80000C98.s")
void func_80000CBC(void) {
@@ -63,9 +78,21 @@ void func_80001050(void) {
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_8000105C.s")
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001074.s")
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001114.s")
void func_80001114(u8 arg0) {
if (arg0 < 0x10) {
func_80063AF0(D_800DC630, arg0);
}
}
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_8000114C.s")
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001170.s")
void func_80001170(u8 arg0) {
if (arg0 < 0x10) {
func_80063B44(D_800DC630, arg0);
}
}
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_800011A8.s")
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_800011E8.s")
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001268.s")
@@ -122,7 +149,32 @@ GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001F14.s")
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001FB8.s")
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_800020E8.s")
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80002110.s")
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80002128.s")
void func_80002128(s32* arg0, s32* arg1, s32* arg2) {
if (arg0 != NULL) {
*arg0 = D_80115D18;
}
if (arg1 != NULL) {
*arg1 = D_80115D28;
}
if (arg2 != NULL) {
*arg2 = D_80115D20;
}
}
/* Unused? */
void func_8000216C(s32* arg0, s32* arg1, s32* arg2) {
if (arg0 != NULL) {
*arg0 = D_80115D1C;
}
if (arg1 != NULL) {
*arg1 = D_80115D2C;
}
if (arg2 != NULL) {
*arg2 = D_80115D24;
}
}
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_800021B0.s")
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80002224.s")
GLOBAL_ASM("asm/non_matchings/unknown_001050/func_800022BC.s")