mirror of
https://github.com/zeldaret/oot
synced 2026-07-11 15:18:59 -04:00
[ntsc-1.2] Match __osMalloc.c and code_800FC620.c (new/delete) (#2106)
* 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:
+1
-3
@@ -2,6 +2,7 @@
|
||||
#define VARIABLES_H
|
||||
|
||||
#include "z64.h"
|
||||
#include "osMalloc.h"
|
||||
#include "segment_symbols.h"
|
||||
|
||||
extern Mtx D_01000000;
|
||||
@@ -234,7 +235,6 @@ extern ActiveSequence gActiveSeqs[4];
|
||||
extern AudioContext gAudioCtx;
|
||||
extern AudioCustomUpdateFunction gAudioCustomUpdateFunction;
|
||||
|
||||
extern u32 __osMalloc_FreeBlockTest_Enable;
|
||||
extern Arena gSystemArena;
|
||||
extern OSPifRam __osContPifRam;
|
||||
extern u8 __osContLastCmd;
|
||||
@@ -248,6 +248,4 @@ extern u64 gGfxSPTaskStack[SP_DRAM_STACK_SIZE64]; // 0x400 bytes
|
||||
extern GfxPool gGfxPools[2]; // 0x24820 bytes
|
||||
extern u8 gAudioHeap[0x38000]; // 0x38000 bytes
|
||||
|
||||
extern u32 gTotalAllocFailures;
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user