mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-08-15 21:00:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up uses of !PLATFORM_N64 vs PLATFORM_GC (#2134)

Browse Source 
* Clean up uses of !PLATFORM_N64 vs PLATFORM_GC

* Put N64 button colors first
This commit is contained in:
cadmic
2024-09-06 02:18:59 -07:00
committed by GitHub
parent 3faa1c6acc
commit 53b2110373
20 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/fault.h
+2 -2
View File
@@ -76,7 +76,7 @@ void Fault_DrawText(s32 x, s32 y, const char* fmt, ...);
#define Fault_SetFontColor(color) (void)0
#define Fault_SetCharPad(padW, padH) (void)0
#else
#elif PLATFORM_GC
void Fault_InitDrawer(void);
void Fault_SetForeColor(u16 color);
@@ -93,7 +93,7 @@ extern vs32 gFaultMsgId;
#define FAULT_MSG_ID gFaultMsgId
#else
#elif PLATFORM_GC
typedef struct FaultMgr {
/* 0x000 */ OSThread thread;
include/gfxprint.h
+1 -1
View File
@@ -34,7 +34,7 @@ typedef struct GfxPrint {
#define GFXP_FLAG_RAINBOW (1 << 1)
#define GFXP_FLAG_SHADOW (1 << 2)
#define GFXP_FLAG_UPDATE (1 << 3)
#if PLATFORM_GC
#if !PLATFORM_N64
#define GFXP_FLAG_ENLARGE (1 << 6)
#endif
#define GFXP_FLAG_OPEN (1 << 7)
include/libc/math.h
+1 -1
View File
@@ -60,7 +60,7 @@ f64 sqrt(f64 f);
#pragma intrinsic(sqrt)
#endif
#if PLATFORM_GC
#if !PLATFORM_N64
extern float qNaN0x3FFFFF;
extern float qNaN0x10000;
extern float sNaN0x3FFFFF;
include/rand.h
+1 -1
View File
@@ -10,7 +10,7 @@ void Rand_Seed_Variable(u32* rndNum, u32 seed);
u32 Rand_Next_Variable(u32* rndNum);
f32 Rand_ZeroOne_Variable(u32* rndNum);
#if PLATFORM_GC
#if !PLATFORM_N64
f32 Rand_Centered(void);
f32 Rand_Centered_Variable(u32* rndNum);
#endif
include/z64interface.h
+3 -3
View File
@@ -151,7 +151,7 @@ typedef struct InterfaceContext {
#define A_BUTTON_X 186
#define A_BUTTON_Y 9
#if PLATFORM_N64
#if !PLATFORM_GC
#define A_BUTTON_R 90
#define A_BUTTON_G 90
#define A_BUTTON_B 255
@@ -164,7 +164,7 @@ typedef struct InterfaceContext {
#define B_BUTTON_X 160
#define B_BUTTON_Y 17
#if PLATFORM_N64
#if !PLATFORM_GC
#define B_BUTTON_R 0
#define B_BUTTON_G 150
#define B_BUTTON_B 0
@@ -186,7 +186,7 @@ typedef struct InterfaceContext {
#define C_UP_BUTTON_X 254
#define C_UP_BUTTON_Y 16
#if PLATFORM_N64
#if !PLATFORM_GC
#define START_BUTTON_R 200
#define START_BUTTON_G 0
#define START_BUTTON_B 0