mirror of
https://github.com/zeldaret/oot
synced 2026-06-07 03:57:35 -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,5 +1,6 @@
|
||||
#include "global.h"
|
||||
#include "fault.h"
|
||||
#include "osMalloc.h"
|
||||
#include "terminal.h"
|
||||
#if PLATFORM_N64
|
||||
#include "n64dd.h"
|
||||
|
||||
Reference in New Issue
Block a user