mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-09-02 18:02:49 -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/versions.h
-16
View File
@@ -16,20 +16,4 @@
#define GC_EU_MQ 12
#define GC_JP_CE 13
#define FAULT_N64 1 // in OoT N64
#define FAULT_GC 2 // in OoT GC
#if PLATFORM_N64
#define FAULT_VERSION FAULT_N64
#else
#define FAULT_VERSION FAULT_GC
#endif
#define RAND_N64 1 // in OoT N64
#define RAND_GC 2 // in OoT GC
#if PLATFORM_N64
#define RAND_VERSION RAND_N64
#else
#define RAND_VERSION RAND_GC
#endif
#endif