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 #14 from DavidSM64/davids-branch

Browse Source 
Named some rng functions, also fixed s64/u64 types.
This commit is contained in:
David Benepe
2020-07-03 18:37:42 -05:00
committed by GitHub
parent 0d77b7d601 820d38e548
commit 0887be4f5a
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/unknown_070110/func_8006F940.s
+1 -1
View File
@@ -1,4 +1,4 @@
glabel func_8006F940
glabel get_rng_seed
/* 070540 8006F940 3C02800E */ lui $v0, 0x800e
/* 070544 8006F944 03E00008 */ jr $ra
/* 070548 8006F948 8C42D434 */ lw $v0, -0x2bcc($v0)
asm/non_matchings/unknown_0B8920/func_800B82B4.s
+3 -3
View File
@@ -229,10 +229,10 @@ glabel func_800B82B4
/* 0B9210 800B8610 03CEF021 */ addu $fp, $fp, $t6
/* 0B9214 800B8614 0000B825 */ move $s7, $zero
.L800B8618:
/* 0B9218 800B8618 0C01BE46 */ jal func_8006F918
/* 0B9218 800B8618 0C01BE46 */ jal save_rng_seed
/* 0B921C 800B861C 00000000 */ nop
/* 0B9220 800B8620 3C045741 */ lui $a0, %hi(D_57410001) # $a0, 0x5741
/* 0B9224 800B8624 0C01BE43 */ jal func_8006F90C
/* 0B9224 800B8624 0C01BE43 */ jal set_rng_seed
/* 0B9228 800B8628 34845646 */ ori $a0, (0x57415646 & 0xFFFF) # ori $a0, $a0, 0x5646
/* 0B922C 800B862C 8E830004 */ lw $v1, 4($s4)
/* 0B9230 800B8630 0000A825 */ move $s5, $zero
@@ -273,7 +273,7 @@ glabel func_800B82B4
/* 0B92B0 800B86B0 0000B825 */ move $s7, $zero
/* 0B92B4 800B86B4 0000A825 */ move $s5, $zero
.L800B86B8:
/* 0B92B8 800B86B8 0C01BE4B */ jal func_8006F92C
/* 0B92B8 800B86B8 0C01BE4B */ jal load_rng_seed
/* 0B92BC 800B86BC 00000000 */ nop
/* 0B92C0 800B86C0 24010002 */ li $at, 2
/* 0B92C4 800B86C4 12610003 */ beq $s3, $at, .L800B86D4
include/types.h
+10 -10
View File
@@ -1,16 +1,16 @@
#ifndef _TYPES_H_
#define _TYPES_H_
typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned int u32;
typedef unsigned long u64;
typedef signed char s8;
typedef signed short s16;
typedef signed int s32;
typedef signed long s64;
typedef float f32;
typedef double f64;
typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned int u32;
typedef unsigned long long u64;
typedef signed char s8;
typedef signed short s16;
typedef signed int s32;
typedef signed long long s64;
typedef float f32;
typedef double f64;
#ifndef NULL
#define NULL 0
src/mips2/unknown_070110.c
+12 -6
View File
@@ -16,27 +16,33 @@ GLOBAL_ASM("asm/non_matchings/unknown_070110/func_8006F6EC.s")
GLOBAL_ASM("asm/non_matchings/unknown_070110/func_8006F768.s")
GLOBAL_ASM("asm/non_matchings/unknown_070110/func_8006F870.s")
void func_8006F90C(s32 arg0) {
void set_rng_seed(s32 arg0) {
D_800DD434 = arg0;
}
void func_8006F918(s32 arg0) {
void save_rng_seed(s32 arg0) {
arg0 = D_800DD434;
D_800DD438 = arg0;
}
void func_8006F92C(s32 arg0) {
void load_rng_seed(s32 arg0) {
arg0 = D_800DD438;
D_800DD434 = arg0;
}
//GLOBAL_ASM("asm/non_matchings/unknown_070110/func_8006F940.s")
s32 func_8006F940(void) {
s32 get_rng_seed(void) {
return D_800DD434;
}
/*
* func_8006F94C(start, end) = Gets a random number within a range.
* Start is inclusive, end is exclusive; also changes the RNG seed.
*
* func_8006F94C(0, 5) will return a number from 0 to 4.
* func_8006F94C(20, 30) will return a number from 20 to 29.
*/
GLOBAL_ASM("asm/non_matchings/unknown_070110/func_8006F94C.s")
GLOBAL_ASM("asm/non_matchings/unknown_070110/func_8006F9B8.s")
GLOBAL_ASM("asm/non_matchings/unknown_070110/func_8006FB60.s")
GLOBAL_ASM("asm/non_matchings/unknown_070110/func_8006FC30.s")