mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-09-09 11:54:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

[ntsc-1.2] Match __osMalloc.c and code_800FC620.c (new/delete) (#2106)

Browse Source 
* Match __osMalloc

* Match src/code/code_800FC620.c (new/delete)

* Wrap versions-specific files in ifdefs to fix compilation

* Fix bss

* Remove {FAULT,RAND,OSMALLOC}_VERSION in favor of PLATFORM_N64

* Fix __osMalloc data splits, add unused strings

* __osMalloc.h -> osMalloc.h

* Fix merge
This commit is contained in:
cadmic
2024-09-04 02:10:14 -07:00
committed by GitHub
parent af24970d89
commit c6d7cc7697
24 changed files with 682 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/rand.h
+1 -2
View File
@@ -2,7 +2,6 @@
#define RAND_H
#include "ultra64.h"
#include "versions.h"
u32 Rand_Next(void);
void Rand_Seed(u32 seed);
@@ -11,7 +10,7 @@ void Rand_Seed_Variable(u32* rndNum, u32 seed);
u32 Rand_Next_Variable(u32* rndNum);
f32 Rand_ZeroOne_Variable(u32* rndNum);
#if RAND_VERSION == RAND_GC
#if PLATFORM_GC
f32 Rand_Centered(void);
f32 Rand_Centered_Variable(u32* rndNum);
#endif