diff options
| author | cadmic <cadmic24@gmail.com> | 2024-09-04 02:10:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-04 11:10:14 +0200 |
| commit | c6d7cc7697c67989b1f018ae2bc934f6677c09b7 (patch) | |
| tree | cadb909a8c2adde978320b8505fc1bda48e3342c /include/versions.h | |
| parent | af24970d8919e4e6bb8356fd5672c938582dfcb8 (diff) | |
[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
Diffstat (limited to 'include/versions.h')
| -rw-r--r-- | include/versions.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/versions.h b/include/versions.h index 1112ac01f..b135ae390 100644 --- a/include/versions.h +++ b/include/versions.h @@ -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 |